home page fixes for 0 projects: hide loading spinner, search box

levenaux · Apr 19, 2016 · 20ad30b · 20ad30b
1 parent 8f69f71
commit 20ad30b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/rundeckapp/grails-app/assets/javascripts/menu/home.js b/rundeckapp/grails-app/assets/javascripts/menu/home.js
@@ -353,7 +353,7 @@ function init() {
         projectNames: projectNamesData.projectNames.sort(),
         projectNamesTotal: projectNamesData.projectNamesTotal || 0
     },statsdata));
-    homedata.loadedProjectNames(projectNamesData.projectNames.length > 0 && projectNamesData.projectNames.length == projectNamesData.projectNamesTotal);
+    homedata.loadedProjectNames(projectNamesData.projectNames.length == projectNamesData.projectNamesTotal);
     ko.applyBindings(homedata);
 
     homedata.pagingMax(pageparams.pagingInitialMax || 15);

diff --git a/rundeckapp/grails-app/views/menu/home2.gsp b/rundeckapp/grails-app/views/menu/home2.gsp
@@ -149,6 +149,7 @@
                 <asset:image src="spinner-gray.gif" width="32px" height="32px"/>
             </div>
             </div>
+            <div data-bind="if: projectCount()>0">
             <div class="list-group-item">
                 <div class="row">
                     <div class="col-sm-12  form-inline">
@@ -173,6 +174,7 @@
                     </div>
                 </div>
             </div>
+            </div>
             <div data-bind="foreach: { data: searchedProjects(), as: 'project' } ">
             %{--Template for project details--}%
                 <div class="list-group-item project_list_item" data-bind="attr: { 'data-project': project }, ">