inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-01 13:06:45 +00:00
Code

Bug fix for path string generation (#3696)

Browse Source
This commit is contained in:
Oliver 2022-09-20 19:39:39 +10:00 committed by GitHub
parent c4c3cdcb31
commit c4f1d8b345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
InvenTree/InvenTree/helpers.py
View File

@ -65,28 +65,10 @@ def constructPathString(path, max_chars=250):
pathstring = '/'.join(path) pathstring = '/'.join(path)
idx = 0
# Replace middle elements to limit the pathstring # Replace middle elements to limit the pathstring
if len(pathstring) > max_chars: if len(pathstring) > max_chars:
mid = len(path) // 2 n = int(max_chars / 2 - 2)
path_l = path[0:mid] pathstring = pathstring[:n] + "..." + pathstring[-n:]
path_r = path[mid:]
# Ensure the pathstring length is limited
while len(pathstring) > max_chars:
# Remove an element from the list
if idx % 2 == 0:
path_l = path_l[:-1]
else:
path_r = path_r[1:]
subpath = path_l + ['...'] + path_r
pathstring = '/'.join(subpath)
idx += 1
return pathstring return pathstring

12
InvenTree/InvenTree/models.py
View File

@ -516,8 +516,18 @@ class InvenTreeTree(MPTTModel):
) )
if pathstring != self.pathstring: if pathstring != self.pathstring:
if 'force_insert' in kwargs:
del kwargs['force_insert']
kwargs['force_update'] = True
self.pathstring = pathstring self.pathstring = pathstring
super().save(force_update=True) super().save(*args, **kwargs)
# Ensure that the pathstring changes are propagated down the tree also
for child in self.get_children():
child.save(*args, **kwargs)
class Meta: class Meta:
"""Metaclass defines extra model properties.""" """Metaclass defines extra model properties."""

2
InvenTree/part/test_category.py
View File

@ -118,7 +118,7 @@ class CategoryTest(TestCase):
self.assertTrue(len(child.path), 26) self.assertTrue(len(child.path), 26)
self.assertEqual( self.assertEqual(
child.pathstring, child.pathstring,
"Cat/AAAAAAAAAA/BBBBBBBBBB/CCCCCCCCCC/DDDDDDDDDD/EEEEEEEEEE/FFFFFFFFFF/GGGGGGGGGG/HHHHHHHHHH/IIIIIIIIII/JJJJJJJJJJ/.../OOOOOOOOOO/PPPPPPPPPP/QQQQQQQQQQ/RRRRRRRRRR/SSSSSSSSSS/TTTTTTTTTT/UUUUUUUUUU/VVVVVVVVVV/WWWWWWWWWW/XXXXXXXXXX/YYYYYYYYYY/ZZZZZZZZZZ" "Cat/AAAAAAAAAA/BBBBBBBBBB/CCCCCCCCCC/DDDDDDDDDD/EEEEEEEEEE/FFFFFFFFFF/GGGGGGGGGG/HHHHHHHHHH/IIIIIIIIII/JJJJJJJJJJ/KKKKKKKKK...OO/PPPPPPPPPP/QQQQQQQQQQ/RRRRRRRRRR/SSSSSSSSSS/TTTTTTTTTT/UUUUUUUUUU/VVVVVVVVVV/WWWWWWWWWW/XXXXXXXXXX/YYYYYYYYYY/ZZZZZZZZZZ"
) )
self.assertTrue(len(child.pathstring) <= 250) self.assertTrue(len(child.pathstring) <= 250)