inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

Merge pull request #1 from matmair/pr/rocheparadox/2138

Browse Source 
fix default setting to not change current behaviour
This commit is contained in:
Roche 2021-10-13 22:06:56 +05:30 committed by GitHub
commit b2670f3565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/common/models.py
View File

@ -727,7 +727,7 @@ class InvenTreeSetting(BaseInvenTreeSetting):
'name': _('Part Name Display Format'), 'name': _('Part Name Display Format'),
'description': _('Format to display the part name'), 'description': _('Format to display the part name'),
'default': "{{ part.IPN if part.IPN }}{{ ' | ' if part.IPN }}{{ part.name }}{{ ' | ' if part.revision }}" 'default': "{{ part.IPN if part.IPN }}{{ ' | ' if part.IPN }}{{ part.name }}{{ ' | ' if part.revision }}"
" {{ part.revision }}", "{{ part.revision if part.revision }}",
'validator': validate_part_name_format 'validator': validate_part_name_format
}, },

2
InvenTree/common/test_views.py
View File

@ -145,7 +145,7 @@ class SettingsViewTest(TestCase):
# test default value # test default value
self.assertEqual(setting.value, "{{ part.IPN if part.IPN }}{{ ' | ' if part.IPN }}{{ part.name }}" self.assertEqual(setting.value, "{{ part.IPN if part.IPN }}{{ ' | ' if part.IPN }}{{ part.name }}"
"{{ '|' if part.revision }} {{ part.revision }}") "{{ ' | ' if part.revision }}{{ part.revision if part.revision }}")
url = self.get_url(setting.pk) url = self.get_url(setting.pk)