COL-1069, no 'No assets' msg until NOT isLoading

ets-berkeley-edu · Jun 28, 2017 · 512dff2 · 512dff2
1 parent 5975936
commit 512dff2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/public/app/assetlibrary/list/assetLibraryListController.js b/public/app/assetlibrary/list/assetLibraryListController.js
@@ -46,6 +46,9 @@
       'ready': true
     };
 
+    // False once getAssets is done
+    $scope.isLoading = true;
+
     // Variable that will keep track of the scroll position in the list
     var scrollPosition = 0;
 
@@ -121,6 +124,7 @@
             $scope.resultsMessage = utilService.buildSearchResultsMessage('Displaying assets', $scope.searchOptions);
           }
         }
+        $scope.isLoading = false;
       });
       // Ensure that the next page is requested the next time
       $scope.list.page++;

diff --git a/public/app/assetlibrary/list/list.html b/public/app/assetlibrary/list/list.html
@@ -70,7 +70,7 @@
       </li>
     </ul>
   </div>
-  <div class="alert alert-info assetlibrary-list-noresults" data-ng-if="isSearch && assets.length === 0">
+  <div class="alert alert-info assetlibrary-list-noresults" data-ng-if="!isLoading && isSearch && assets.length === 0">
     No matching assets were found.
   </div>
   <!-- COPYRIGHT -->