inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 20:45:44 +00:00
Code Activity

Refactor how form errors are handled

Browse Source 
- When in doubt, refer to the django docs
- There was a *much* better way (thanks, form.add_error)!
- The anti-pattern was deleted, and lo, there was much rejoicing
- Some other refactoring too
This commit is contained in:
Oliver Walters
2020-10-28 23:33:33 +11:00
parent d06b4d7c9f
commit 091a9d9803
8 changed files with 112 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
InvenTree/order/views.py
View File

@ -415,7 +415,7 @@ class PurchaseOrderCancel(AjaxUpdateView):
valid = False
if not confirm:
form.errors['confirm'] = [_('Confirm order cancellation')]
form.add_error('confirm', _('Confirm order cancellation'))
else:
valid = True
@ -448,13 +448,13 @@ class SalesOrderCancel(AjaxUpdateView):
valid = False
if not confirm:
form.errors['confirm'] = [_('Confirm order cancellation')]
form.add_error('confirm', _('Confirm order cancellation'))
else:
valid = True
if valid:
if not order.cancel_order():
form.non_field_errors = [_('Could not cancel order')]
form.add_error(None, _('Could not cancel order'))
valid = False
data = {
@ -484,7 +484,7 @@ class PurchaseOrderIssue(AjaxUpdateView):
valid = False
if not confirm:
form.errors['confirm'] = [_('Confirm order placement')]
form.add_error('confirm', _('Confirm order placement'))
else:
valid = True
@ -558,13 +558,13 @@ class SalesOrderShip(AjaxUpdateView):
valid = False
if not confirm:
form.errors['confirm'] = [_('Confirm order shipment')]
form.add_error('confirm', _('Confirm order shipment'))
else:
valid = True
if valid:
if not order.ship_order(request.user):
form.non_field_errors = [_('Could not ship order')]
form.add_error(None, _('Could not ship order'))
valid = False
data = {
@ -1135,7 +1135,7 @@ class POLineItemCreate(AjaxCreateView):
order = PurchaseOrder.objects.get(id=order_id)
except (ValueError, PurchaseOrder.DoesNotExist):
order = None
form.errors['order'] = [_('Invalid Purchase Order')]
form.add_error('order', _('Invalid Purchase Order'))
valid = False
try:
@ -1143,12 +1143,12 @@ class POLineItemCreate(AjaxCreateView):
if order is not None:
if not sp.supplier == order.supplier:
form.errors['part'] = [_('Supplier must match for Part and Order')]
form.add_error('part', _('Supplier must match for Part and Order'))
valid = False
except (SupplierPart.DoesNotExist, ValueError):
valid = False
form.errors['part'] = [_('Invalid SupplierPart selection')]
form.add_error('part', _('Invalid SupplierPart selection'))
data = {
'form_valid': valid,