Fixed regression on autocomplete feature of object.

cerberustesting · Jun 6, 2024 · 632dd5a · 632dd5a
1 parent a8b1df2
commit 632dd5a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/source/src/main/webapp/js/global/autocomplete.js b/source/src/main/webapp/js/global/autocomplete.js
@@ -296,6 +296,7 @@ function initTags(configs, context) {
 
     return Promise.all([objectsPromise]).then(function (data) {
         var availableObjects = data[0];
+//        console.info(availableObjects);
         var availableProperties = testCaseProperties.concat(inheritedProperties.filter(function (item) {
             return testCaseProperties.indexOf(item) < 0;
         }));
@@ -493,14 +494,6 @@ function initTags(configs, context) {
             "X-Requested-With"
         ];
         let tags = [
-            {
-                name: 'datalibProperty',
-                array: availableDatalibProperties,
-                regex: "%datalib\\.[^\\.]*\\.",
-                addBefore: "",
-                addAfter: "%",
-                isCreatable: false
-            },
             {
                 name: 'objectProperty',
                 array: availableObjectProperties,
@@ -517,6 +510,14 @@ function initTags(configs, context) {
                 addAfter: ".",
                 isCreatable: true
             },
+            {
+                name: 'datalibProperty',
+                array: availableDatalibProperties,
+                regex: "%datalib\\.[^\\.]*\\.",
+                addBefore: "",
+                addAfter: "%",
+                isCreatable: false
+            },
             {
                 name: 'datalib',
                 array: availableObjects,

diff --git a/source/src/main/webapp/js/pages/TestCaseScript.js b/source/src/main/webapp/js/pages/TestCaseScript.js
@@ -3634,6 +3634,8 @@ var autocompleteAllFields, getTags, setTags, handlerToDeleteOnStepChange = [];
                                             .attr("src", "ReadApplicationObjectImage?application=" + tcInfo.application + "&object=" + name + "&time=" + new Date().getTime())
                                             .attr("data-toggle", "tooltip").attr("title", name).attr("onclick", "displayPictureOfMinitature1(this)");
                                 }
+                                console.info(TagsToUse[1]);
+                                console.info(name);
                                 if (!objectIntoTagToUseExist(TagsToUse[1], name)) {
                                     var addEntry = $('<span class="input-group-btn many ' + name + '"><button id="editEntry" onclick="openModalApplicationObject(\'' + tcInfo.application + '\', \'' + name + '\',\'ADD\'  ,\'testCaseScript\' );"\n\
 	                                		class="buttonObject btn btn-default input-sm " \n\