Merge pull request #3982 from waldenraines/bug-5207

Fixes #5207, show a message on empty content view puppet modules list.
Katello · Apr 17, 2014 · a90e1c7 · a90e1c7
2 parents a2e2024 + a19b45c
commit a90e1c7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/...s/bastion/app/assets/javascripts/bastion/content-views/details/filters/views/filters.html b/...s/bastion/app/assets/javascripts/bastion/content-views/details/filters/views/filters.html
@@ -18,7 +18,12 @@ <h3 translate>Filters</h3>
   </div>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered" ng-class="{'table-mask': detailsTable.working}">
+    <p class="alert alert-info" ng-show="detailsTable.rows.length === 0" translate>
+      You currently don't have any Filters included in this Content View, you can add a new Filter by using the button on the right.
+    </p>
+
+    <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0"
+           ng-class="{'table-mask': detailsTable.working}">
 
       <thead>
         <tr alch-table-head row-select>

diff --git a/...ripts/bastion/content-views/details/puppet-modules/views/content-view-puppet-modules.html b/...ripts/bastion/content-views/details/puppet-modules/views/content-view-puppet-modules.html
@@ -20,7 +20,11 @@
   </div>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered">
+    <p class="alert alert-info" ng-show="detailsTable.rows.length === 0" translate>
+      You currently don't have any Puppet Modules included in this Content View, you can add puppet modules using the button on the right.
+    </p>
+
+    <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0">
       <thead>
         <tr alch-table-head>
           <th alch-table-column>{{ "Name" | translate }}</th>

diff --git a/...app/assets/javascripts/bastion/content-views/details/views/content-view-repositories.html b/...app/assets/javascripts/bastion/content-views/details/views/content-view-repositories.html
@@ -54,9 +54,25 @@ <h3 translate>
   </div>
 
   <div alch-table="repositoriesTable" class="nutupane">
+
+    <div ng-show="repositoriesTable.rows.length === 0 && !repositoriesTable.working">
+      <p class="alert alert-info" ng-show="isState('content-views.details.repositories.list')" translate>
+        There are currently no repositories associated with this Content View, you can add some by clicking on the "Add" tab above.
+      </p>
+      <p class="alert alert-info" ng-show="isState('content-views.details.repositories.available')">
+        <span translate>There are currently no repositories to add to this Content View,</span>
+        <a ui-sref="products.index" translate>add some repositories.</a>
+      </p>
+    </div>
+
+    <div class="loading-mask loading-mask-panel" ng-show="repositoriesTable.working">
+      <i class="icon-spinner icon-spin"></i>
+      {{ "Loading..." | translate }}
+    </div>
+
     <div alch-infinite-scroll="repositoriesTable.nextPage()" data="repositoriesTable.rows">
 
-      <table class="table table-bordered table-striped">
+      <table ng-show="repositoriesTable.rows.length > 0"  class="table table-bordered table-striped">
         <thead>
           <tr alch-table-head row-select>
             <th alch-table-column translate>Name</th>