inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-03 22:55:43 +00:00
Code Activity

Refactor toot-toot

Browse Source 
- Now can specify the "order" of fields
This commit is contained in:
Oliver
2021-06-24 00:06:27 +10:00
parent 1754af3d43
commit 9f3f07aff3
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
InvenTree/templates/js/forms.js
View File

@@ -193,23 +193,39 @@ function constructCreateForm(url, fields, options={}) {
ignored_fields.push('id');
}
for (const key in fields) {
// Construct an ordered list of field names
var field_names = [];
// Skip over fields
if (allowed_fields && !allowed_fields.includes(key)) {
continue;
if (allowed_fields) {
allowed_fields.forEach(function(name) {
// Only push names which are actually in the set of fields
if (name in fields) {
if (!ignored_fields.includes(name) && !field_names.includes(name)) {
field_names.push(name);
}
} else {
console.log(`WARNING: '${name}' does not match a valid field name.`);
}
});
} else {
for (const name in fields) {
if (!ignored_fields.includes(name) && !field_names.includes(name)) {
field_names.push(name);
}
}
}
if (ignored_fields && ignored_fields.includes(key)) {
continue;
}
field_names.forEach(function(name) {
var field = fields[key];
var field = fields[name];
var f = constructField(key, field, options);
var f = constructField(name, field, options);
html += f;
}
});
var modal = '#modal-form';