`;
// Add a label
- if (!options.hideLabels) {
+ if (!options.hideLabels && parameters.type !== "nested object" && parameters.type !== "dependent field") {
html += constructLabel(name, parameters);
}
@@ -2501,6 +2586,12 @@ function constructInput(name, parameters, options={}) {
case 'raw':
func = constructRawInput;
break;
+ case 'nested object':
+ func = constructNestedObject;
+ break;
+ case 'dependent field':
+ func = constructDependentField;
+ break;
default:
// Unsupported field type!
break;
@@ -2780,6 +2871,129 @@ function constructRawInput(name, parameters) {
}
+/*
+ * Construct a nested object input
+ */
+function constructNestedObject(name, parameters, options) {
+ let html = `
+
";
+
+ return html;
+}
+
+function getFieldByNestedPath(name, fields) {
+ if (typeof name === "string") {
+ name = name.split("__");
+ }
+
+ if (name.length === 0) return fields;
+
+ if (fields.type === "nested object") fields = fields.children;
+
+ if (!(name[0] in fields)) return null;
+ let field = fields[name[0]];
+
+ if (field.type === "dependent field" && field.child) {
+ field = field.child;
+ }
+
+ return getFieldByNestedPath(name.slice(1), field);
+}
+
+/*
+ * Construct a dependent field input
+ */
+function constructDependentField(name, parameters, options) {
+ // add onEdit handler to all fields this dependent field depends on
+ for (let d_field_name of parameters.depends_on) {
+ const d_field = getFieldByNestedPath([...name.split("__").slice(0, -1), d_field_name], options.fields);
+ if (!d_field) continue;
+
+ const onEdit = (value, name, field, options) => {
+ if(value === undefined) return;
+
+ // extract the current form data to include in OPTIONS request
+ const data = extractFormData(options.fields, options, false)
+
+ $.ajax({
+ url: options.url,
+ type: "OPTIONS",
+ data: JSON.stringify(data),
+ contentType: "application/json",
+ dataType: "json",
+ accepts: { json: "application/json" },
+ success: (res) => {
+ const fields = res.actions[options.method];
+
+ // merge already entered values in the newly constructed form
+ options.data = extractFormData(options.fields, options);
+
+ // remove old submit handlers
+ $(options.modal).off('click', '#modal-form-submit');
+
+ if (options.method === "POST") {
+ constructCreateForm(fields, options);
+ }
+
+ if (options.method === "PUT" || options.method === "PATCH") {
+ constructChangeForm(fields, options);
+ }
+
+ if (options.method === "DELETE") {
+ constructDeleteForm(fields, options);
+ }
+ },
+ error: (xhr) => showApiError(xhr, options.url)
+ });
+ }
+
+ // attach on edit handler
+ const originalOnEdit = d_field.onEdit;
+ d_field.onEdit = [onEdit];
+
+ if(typeof originalOnEdit === "function") {
+ d_field.onEdit.push(originalOnEdit);
+ } else if (Array.isArray(originalOnEdit)) {
+ // push old onEdit handlers, but omit the old
+ d_field.onEdit.push(...originalOnEdit.filter(h => h !== d_field._currentDependentFieldOnEdit));
+ }
+
+ // track current onEdit handler function
+ d_field._currentDependentFieldOnEdit = onEdit;
+ }
+
+ // child is not specified already, return a dummy div with id so no errors can happen
+ if (!parameters.child) {
+ return `
`;
+ }
+
+ // copy label to child if not already provided
+ if(!parameters.child.label) {
+ parameters.child.label = parameters.label;
+ }
+
+ // construct the provided child field
+ return constructField(name, parameters.child, options);
+}
/*
* Construct a 'help text' div based on the field parameters
diff --git a/InvenTree/templates/js/translated/label.js b/InvenTree/templates/js/translated/label.js
index 57ee46e919..a9a75f0f56 100644
--- a/InvenTree/templates/js/translated/label.js
+++ b/InvenTree/templates/js/translated/label.js
@@ -137,6 +137,11 @@ function printLabels(options) {
// update form
updateForm(formOptions);
+
+ // workaround to fix a bug where one cannot scroll after changing the plugin
+ // without opening and closing the select box again manually
+ $("#id__plugin").select2("open");
+ $("#id__plugin").select2("close");
}
const printingFormOptions = {
diff --git a/InvenTree/users/models.py b/InvenTree/users/models.py
index 19bc91f611..4cd01439ed 100644
--- a/InvenTree/users/models.py
+++ b/InvenTree/users/models.py
@@ -6,7 +6,7 @@ import logging
from django.conf import settings
from django.contrib import admin
from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group, Permission
+from django.contrib.auth.models import Group, Permission, User
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.core.cache import cache
@@ -21,6 +21,7 @@ from django.utils.translation import gettext_lazy as _
from rest_framework.authtoken.models import Token as AuthToken
+import common.models as common_models
import InvenTree.helpers
import InvenTree.models
from InvenTree.ready import canAppAccessDatabase
@@ -28,6 +29,22 @@ from InvenTree.ready import canAppAccessDatabase
logger = logging.getLogger("inventree")
+# OVERRIDE START
+# Overrides Django User model __str__ with a custom function to be able to change
+# string representation of a user
+def user_model_str(self):
+ """Function to override the default Django User __str__"""
+
+ if common_models.InvenTreeSetting.get_setting('DISPLAY_FULL_NAMES'):
+ if self.first_name or self.last_name:
+ return f'{self.first_name} {self.last_name}'
+ return self.username
+
+
+User.add_to_class("__str__", user_model_str) # Overriding User.__str__
+# OVERRIDE END
+
+
def default_token():
"""Generate a default value for the token"""
return ApiToken.generate_key()
@@ -785,10 +802,16 @@ class Owner(models.Model):
def __str__(self):
"""Defines the owner string representation."""
- return f'{self.owner} ({self.owner_type.name})'
+ if self.owner_type.name == 'user' and common_models.InvenTreeSetting.get_setting('DISPLAY_FULL_NAMES'):
+ display_name = self.owner.get_full_name()
+ else:
+ display_name = str(self.owner)
+ return f'{display_name} ({self.owner_type.name})'
def name(self):
"""Return the 'name' of this owner."""
+ if self.owner_type.name == 'user' and common_models.InvenTreeSetting.get_setting('DISPLAY_FULL_NAMES'):
+ return self.owner.get_full_name()
return str(self.owner)
def label(self):