Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1038 from mpdgraev/fix_int_barcode

Browse Source 
fix error when submitting some non-dict barcodes
This commit is contained in:
Oliver 2020-10-19 00:01:38 +11:00 committed by GitHub
commit 529c4052ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/barcode/plugins/inventree_barcode.py
View File

@ -42,6 +42,8 @@ class InvenTreeBarcodePlugin(BarcodePlugin):
elif type(self.data) is str: elif type(self.data) is str:
try: try:
self.data = json.loads(self.data) self.data = json.loads(self.data)
if type(self.data) is not dict:
return False
except json.JSONDecodeError: except json.JSONDecodeError:
return False return False
else: else:

28
InvenTree/barcode/tests.py
View File

@ -56,6 +56,34 @@ class BarcodeAPITest(APITestCase):
self.assertIn('plugin', data) self.assertIn('plugin', data)
self.assertIsNone(data['plugin']) self.assertIsNone(data['plugin'])
def test_integer_barcode(self):
response = self.postBarcode(self.scan_url, '123456789')
self.assertEqual(response.status_code, status.HTTP_200_OK)
data = response.data
self.assertIn('error', data)
self.assertIn('barcode_data', data)
self.assertIn('hash', data)
self.assertIn('plugin', data)
self.assertIsNone(data['plugin'])
def test_array_barcode(self):
response = self.postBarcode(self.scan_url, "['foo', 'bar']")
self.assertEqual(response.status_code, status.HTTP_200_OK)
data = response.data
self.assertIn('error', data)
self.assertIn('barcode_data', data)
self.assertIn('hash', data)
self.assertIn('plugin', data)
self.assertIsNone(data['plugin'])
def test_barcode_generation(self): def test_barcode_generation(self):
item = StockItem.objects.get(pk=522) item = StockItem.objects.get(pk=522)