inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-05 05:00:58 +00:00
Code Activity

Refactor how form errors are handled

Browse Source 
- Use form.add_error (as the django gods intended)
This commit is contained in:
Oliver Walters
2020-10-28 23:33:33 +11:00
parent fb28204dfd
commit c533f59405
8 changed files with 80 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
InvenTree/stock/views.py
View File

@ -417,8 +417,8 @@ class StockItemDeleteTestData(AjaxUpdateView):
confirm = str2bool(request.POST.get('confirm', False))
if confirm is not True:
form.errors['confirm'] = [_('Confirm test data deletion')]
form.non_field_errors = [_('Check the confirmation box')]
form.add_error('confirm', _('Confirm test data deletion'))
form.add_error(None, _('Check the confirmation box'))
else:
stock_item.test_results.all().delete()
valid = True
@ -918,7 +918,7 @@ class StockItemUninstall(AjaxView, FormMixin):
if not confirmed:
valid = False
form.errors['confirm'] = [_('Confirm stock adjustment')]
form.add_error('confirm', _('Confirm stock adjustment'))
data = {
'form_valid': valid,
@ -1116,7 +1116,7 @@ class StockAdjust(AjaxView, FormMixin):
if not confirmed:
valid = False
form.errors['confirm'] = [_('Confirm stock adjustment')]
form.add_error('confirm', _('Confirm stock adjustment'))
data = {
'form_valid': valid,
@ -1416,7 +1416,7 @@ class StockItemSerialize(AjaxUpdateView):
try:
numbers = ExtractSerialNumbers(serials, quantity)
except ValidationError as e:
form.errors['serial_numbers'] = e.messages
form.add_error('serial_numbers', e.messages)
valid = False
numbers = []
@ -1428,9 +1428,9 @@ class StockItemSerialize(AjaxUpdateView):
for k in messages.keys():
if k in ['quantity', 'destination', 'serial_numbers']:
form.errors[k] = messages[k]
form.add_error(k, messages[k])
else:
form.non_field_errors = [messages[k]]
form.add_error(None, messages[k])
valid = False
@ -1622,14 +1622,14 @@ class StockItemCreate(AjaxCreateView):
part = None
quantity = 1
valid = False
form.errors['quantity'] = [_('Invalid quantity')]
form.add_error('quantity', _('Invalid quantity'))
if quantity < 0:
form.errors['quantity'] = [_('Quantity cannot be less than zero')]
form.add_error('quantity', _('Quantity cannot be less than zero'))
valid = False
if part is None:
form.errors['part'] = [_('Invalid part selection')]
form.add_error('part', _('Invalid part selection'))
else:
# A trackable part must provide serial numbesr
if part.trackable:
@ -1642,15 +1642,14 @@ class StockItemCreate(AjaxCreateView):
try:
serials = ExtractSerialNumbers(sn, quantity)
existing = []
for serial in serials:
if part.checkIfSerialNumberExists(serial):
existing.append(serial)
existing = part.find_conflicting_serial_numbers(serials)
if len(existing) > 0:
exists = ",".join([str(x) for x in existing])
form.errors['serial_numbers'] = [_('The following serial numbers already exist: ({sn})'.format(sn=exists))]
form.add_error(
'serial_numbers',
_('Serial numbers already exist') + ': ' + exists
)
valid = False
else:
@ -1682,7 +1681,7 @@ class StockItemCreate(AjaxCreateView):
valid = True
except ValidationError as e:
form.errors['serial_numbers'] = e.messages
form.add_error('serial_numbers', e.messages)
valid = False
else: