Merge branch 'master' into fix-radio-validation

timja · Jan 12, 2024 · e7b0e1f · e7b0e1f
2 parents 0fd7d3a + dd7488b
commit e7b0e1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -1 +1 @@
--Xmx1100m
+-Xmx1400m
diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js
@@ -334,7 +334,15 @@ $.when(getItems()).done(function (data) {
         if (!getFieldValidationStatus("name")) {
           activateValidationMessage("#itemname-required", ".add-item-name");
           setTimeout(function () {
-            $('input[name="name"][type="text"]', "#createItem").focus();
+            var parentName = $('input[name="from"]', "#createItem").val();
+            $.get("job/" + parentName + "/api/json?tree=name").done(
+              function (data) {
+                if (data.name === parentName) {
+                  //if "name" is invalid, but "from" is a valid job, then switch focus to "name"
+                  $('input[name="name"][type="text"]', "#createItem").focus();
+                }
+              },
+            );
           }, 400);
         } else {
           if (getFormValidationStatus()) {