fixed #2518

Filter button on homepage is blue when filters exist + Modal with save button.
cerberustesting · Jan 18, 2024 · 90cac71 · 90cac71
1 parent 5d75b00
commit 90cac71
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/source/src/main/webapp/include/pages/homepage/tagSettingsModal.html b/source/src/main/webapp/include/pages/homepage/tagSettingsModal.html
@@ -23,7 +23,7 @@ <h3 class="modal-title-line">Or a Search Text</h3>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal" name="buttonClose">Close</button>
-                <button type="button" id="saveTagList" class="btn btn-primary" name="buttonAdd">Save</button>
+                <button type="button" id="saveTagList" class="btn btn-primary" name="buttonSave">Save</button>
             </div>
         </div>
     </div>

diff --git a/source/src/main/webapp/js/pages/Homepage.js b/source/src/main/webapp/js/pages/Homepage.js
@@ -516,6 +516,11 @@ function loadTagExec() {
     //Get the last tag to display
     var tagList = JSON.parse(localStorage.getItem("tagList"));
     var searchTag = localStorage.getItem("tagSearchString");
+    if (searchTag || (tagList && tagList.length > 0)) {
+        $("#tagSettings").addClass("btn-primary");
+    } else {
+        $("#tagSettings").removeClass("btn-primary");
+    }
 
     if (tagList === null || tagList.length === 0) {
         tagList = readLastTagExec(searchTag);
@@ -615,11 +620,11 @@ function aoColumnsFunc() {
             }
         },
         {
-            "data": "Total", 
+            "data": "Total",
             "bSortable": true,
             "sWidth": "10px",
-            "sClass": "datatable-alignright", 
-            "sName": "Total", 
+            "sClass": "datatable-alignright",
+            "sName": "Total",
             "title": "Total"
         }
     ];
@@ -636,10 +641,11 @@ function aoColumnsFunc() {
                 "mRender": function (data, type, oObj) {
                     if ((data) === 0) {
                         return "";
-                    };
-                    return data;
                     }
-                };
+                    ;
+                    return data;
+                }
+            };
             aoColumns.push(obj);
         }
     }
@@ -698,6 +704,11 @@ function appendBuildRevRow(dtb) {
 
 function updateStats() {
 
+    $("#hp_TestcaseNumber").text("Calculating existing test cases...");
+    $("#hp_TestExecutionNumber").text("Calculating launched test cases...");
+    $("#hp_ApplicationNumber").text("Calculating configured applications...");
+
+
     var jqxhr = $.getJSON("ReadTestCase", "iDisplayLength=1");
     $.when(jqxhr).then(function (result) {
         $("#hp_TestcaseNumber").text(result["iTotalRecords"] + " existing test cases");