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

[CUI] Non field errors (#7672)

Browse Source 
* Fix typo

* [CUI] Display hidden error messages in forms

* Adjust build checks

* Improve error checking
This commit is contained in:
Oliver
2024-07-17 17:44:51 +10:00
committed by GitHub
parent eacd28bf19
commit 234b0ed72c
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/backend/InvenTree/build/models.py
View File

@@ -120,26 +120,28 @@ class Build(
self.validate_reference_field(self.reference)
self.reference_int = self.rebuild_reference_field(self.reference)
if get_global_setting('BUILDORDER_REQUIRE_VALID_BOM'):
# Check that the BOM is valid
if not self.part.is_bom_valid():
raise ValidationError({
'part': _('Assembly BOM has not been validated')
})
# Check part when initially creating the build order
if not self.pk or self.has_field_changed('part'):
if get_global_setting('BUILDORDER_REQUIRE_VALID_BOM'):
# Check that the BOM is valid
if not self.part.is_bom_valid():
raise ValidationError({
'part': _('Assembly BOM has not been validated')
})
if get_global_setting('BUILDORDER_REQUIRE_ACTIVE_PART'):
# Check that the part is active
if not self.part.active:
raise ValidationError({
'part': _('Build order cannot be created for an inactive part')
})
if get_global_setting('BUILDORDER_REQUIRE_ACTIVE_PART'):
# Check that the part is active
if not self.part.active:
raise ValidationError({
'part': _('Build order cannot be created for an inactive part')
})
if get_global_setting('BUILDORDER_REQUIRE_LOCKED_PART'):
# Check that the part is locked
if not self.part.locked:
raise ValidationError({
'part': _('Build order cannot be created for an unlocked part')
})
if get_global_setting('BUILDORDER_REQUIRE_LOCKED_PART'):
# Check that the part is locked
if not self.part.locked:
raise ValidationError({
'part': _('Build order cannot be created for an unlocked part')
})
# On first save (i.e. creation), run some extra checks
if self.pk is None:

19
src/backend/InvenTree/templates/js/translated/forms.js
View File

@@ -1502,8 +1502,23 @@ function handleFormErrors(errors, fields={}, options={}) {
for (var field_name in errors) {
var field = fields[field_name] || {};
var field_errors = errors[field_name];
let field = fields[field_name] || null;
let field_errors = errors[field_name];
// No matching field - append to non_field_errors
if (!field || field.hidden) {
if (Array.isArray(field_errors)) {
field_errors.forEach((err) => {
non_field_errors.append(`<div class='alert alert-block alert-danger'>${err}</div>`);
});
} else {
non_field_errors.append(`<div class='alert alert-block alert-danger'>${field_errors.toString()}</div>`);
}
continue;
}
// for nested objects with children and dependent fields with a child defined, extract nested errors
if (((field.type == 'nested object') && ('children' in field)) || ((field.type == 'dependent field') && ('child' in field))) {