katello 3.1.0.1 → 3.2.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/views/gpg-keys.html

@@ -3,18 +3,21 @@
 <div data-extend-template="layouts/nutupane.html">
 
   <div data-block="header">
-    {{ 'Gpg Keys' | translate }}
+    {{ 'GPG Keys' | translate }}
   </div>
 
   <div data-block="actions">
     <button class="btn btn-primary" ui-sref="gpg-keys.new" ng-hide="denied('create_gpg_keys')">
       <i class="fa fa-plus"></i>
-      {{ "New Gpg Key" | translate }}
+      {{ "New GPG Key" | translate }}
     </button>
   </div>
 
   <span data-block="no-rows-message" translate>
-    You currently don't have any Gpg keys, you can add Gpg keys using the button on the right.
+    You currently don't have any GPG keys, you can add GPG keys using the button on the right.
   </span>
 
+   <span data-block="no-search-results-message">
+     Your search returned zero GPG keys.
+   </span>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html

@@ -20,6 +20,10 @@
     You currently don't have any Content Hosts, you can create new Content Hosts by selecting Contents Host from main menu and then clicking the button on the right.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Content Hosts.
+  </span>
+
   <div data-block="table">
     <table ng-class="{'table-mask': detailsTable.working}"
            class="table table-full table-striped"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-details.html

@@ -1,100 +1,99 @@
 <span page-title ng-model="hostCollection">{{ 'Host Collection: ' | translate }} {{ hostCollection.name }}</span>
 
-<div class="loading-mask loading-mask-panel" ng-show="panel.loading">
-  <i class="fa fa-spinner fa-spin"></i>
-  {{ "Loading..." | translate }}
-</div>
+<div data-extend-template="layouts/panel.html">
+  <div data-block="panel">
+    <section class="nutupane-details" ng-cloak bst-container-scroll>
+      <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+      <div ng-hide="panel.error">
+        <header class="details-header">
+          <h2 class="fl" translate>Host Collection: {{ hostCollection.name }}</h2>
 
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="fl" translate>Host Collection: {{ hostCollection.name }}</h2>
-
-      <div class="details-actions fr">
-        <button class="btn btn-default"
-                ng-click="openModal()"
-                ng-hide="denied('destroy_host_collections', hostCollection)"
-                translate>
-          Remove
-        </button>
-
-        <button class="btn btn-default"
-                ng-hide="denied('create_host_collections')"
-                ng-click="showCopy = true">
-          <i class="fa fa-copy"></i>
-          {{ "Copy Collection" | translate }}
-        </button>
-
-        <button class="btn btn-default" ui-sref="host-collections.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-
-        <div bst-modal="removeHostCollection(hostCollection)" model="hostCollection">
-          <div data-block="modal-header" translate>Remove Host Collection "{{ hostCollection.name }}"?</div>
-          <div data-block="modal-body" translate>Are you sure you want to remove Host Collection "{{ hostCollection.name }}"?</div>
-        </div>
-      </div>
-    </header>
+          <div class="details-actions fr">
+            <button class="btn btn-default"
+                    ng-click="openModal()"
+                    ng-hide="denied('destroy_host_collections', hostCollection)"
+                    translate>
+              Remove
+            </button>
 
-    <div ng-show="showCopy" class="fr action-pane" >
-      <form>
-        <h5 translate>Copy</h5>
-        <div class="input">
-          <div bst-alerts error-messages="copyErrorMessages"></div>
-          <div class="info-label">
-            <label for="copy_name" translate>New Name:</label>
-          </div>
-          <input ng-model="copyName"
-                 id="copy_name"
-                 name="copy_name"
-                 tabindex="1"
-                 autofocus
-                 required/>
-          <div>
-            <button class="btn btn-default" ng-click="copy(copyName)">
-              {{ "Create" | translate }}
+            <button class="btn btn-default"
+                    ng-hide="denied('create_host_collections')"
+                    ng-click="showCopy = true">
+              <i class="fa fa-copy"></i>
+              {{ "Copy Collection" | translate }}
             </button>
-            <button class="btn btn-default" ng-click="showCopy = false">
-              {{ "Cancel" | translate }}
+
+            <button class="btn btn-default" ui-sref="host-collections.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
             </button>
+
+            <div bst-modal="removeHostCollection(hostCollection)" model="hostCollection">
+              <div data-block="modal-header" translate>Remove Host Collection "{{ hostCollection.name }}"?</div>
+              <div data-block="modal-body" translate>Are you sure you want to remove Host Collection "{{ hostCollection.name }}"?</div>
+            </div>
           </div>
+        </header>
+
+        <div ng-show="showCopy" class="fr action-pane" >
+          <form>
+            <h5 translate>Copy</h5>
+            <div class="input">
+              <div bst-alerts error-messages="copyErrorMessages"></div>
+              <div class="info-label">
+                <label for="copy_name" translate>New Name:</label>
+              </div>
+              <input ng-model="copyName"
+                     id="copy_name"
+                     name="copy_name"
+                     tabindex="1"
+                     autofocus
+                     required/>
+              <div>
+                <button class="btn btn-default" ng-click="copy(copyName)">
+                  {{ "Create" | translate }}
+                </button>
+                <button class="btn btn-default" ng-click="showCopy = false">
+                  {{ "Cancel" | translate }}
+                </button>
+              </div>
+            </div>
+          </form>
         </div>
-      </form>
-    </div>
 
-    <nav class="details-navigation">
-      <ul>
-        <li ng-class="{active: isState('host-collections.details.info')}">
-          <a ui-sref="host-collections.details.info">
-            <span translate>
-              Details
-            </span>
-          </a>
-        </li>
+        <nav class="details-navigation">
+          <ul>
+            <li ng-class="{active: isState('host-collections.details.info')}">
+              <a ui-sref="host-collections.details.info">
+                <span translate>
+                  Details
+                </span>
+              </a>
+            </li>
 
-        <li ng-class="{active: stateIncludes('host-collections.details.hosts')}">
-          <a ui-sref="host-collections.details.hosts.list">
-            <span translate>
-              Hosts
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: isState('host-collections.details.actions')}"
-            ng-show="permitted('edit_host_collections', hostCollection)">
-          <a ui-sref="host-collections.details.actions">
-            <span translate>
-              Collection Actions
-            </span>
-          </a>
-        </li>
-      </ul>
-    </nav>
+            <li ng-class="{active: stateIncludes('host-collections.details.hosts')}">
+              <a ui-sref="host-collections.details.hosts.list">
+                <span translate>
+                  Hosts
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: isState('host-collections.details.actions')}"
+                ng-show="permitted('edit_host_collections', hostCollection)">
+              <a ui-sref="host-collections.details.actions">
+                <span translate>
+                  Collection Actions
+                </span>
+              </a>
+            </li>
+          </ul>
+        </nav>
 
-    <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+        <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
-    <section class="nutupane-sub-section" ui-view></section>
+        <section class="nutupane-sub-section" ui-view></section>
+      </div>
+    </section>
   </div>
-</section>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-hosts-list.html

@@ -19,6 +19,10 @@
     You currently don't have any Hosts in this Host Group, you can add Content Hosts after selecting the 'Add' tab.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Content Hosts.
+  </span>
+
   <div data-block="table">
     <table ng-class="{'table-mask': detailsTable.working}"
            class="table table-full table-striped"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/host-collections.module.js

@@ -9,6 +9,7 @@ angular.module('Bastion.host-collections', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.common',
     'Bastion.utils'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/new/views/host-collection-new.html

@@ -1,22 +1,21 @@
 <span page-title>{{ 'New Host Collection' | translate }}</span>
 
-<div class="loading-mask loading-mask-panel" ng-show="panel.loading">
-  <i class="fa fa-spinner fa-spin"></i>
-  {{ "Loading..." | translate }}
-</div>
+<div data-extend-template="layouts/panel.html">
+  <div data-block="panel">
+    <section class="nutupane-details" ng-cloak bst-container-scroll>
+      <header class="new-header details-header">
+        <h2 class="fl" translate>New Host Collection</h2>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <header class="new-header details-header">
-    <h2 class="fl" translate>New Host Collection</h2>
+        <div class="details-actions fr">
+          <button class="btn btn-default" ui-sref="host-collections.index">
+            <i class="fa fa-remove"></i>
+            {{ "Close" | translate }}
+          </button>
+        </div>
+      </header>
 
-    <div class="details-actions fr">
-      <button class="btn btn-default" ui-sref="host-collections.index">
-        <i class="fa fa-remove"></i>
-        {{ "Close" | translate }}
-      </button>
-    </div>
-  </header>
+      <div ui-view></div>
 
-  <div ui-view></div>
-
-</section>
+    </section>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/views/host-collections.html

@@ -18,4 +18,9 @@
   <span data-block="no-rows-message" translate>
     You currently don't have any Host Collections, you can add Host Collections using the button on the right.
   </span>
+
+  <span data-block="no-search-results-message">
+    Your search returned zero Host Collections.
+  </span>
+
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js

@@ -0,0 +1,28 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.hosts.factory:HostBulkAction
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for bulk actions on hosts.
+ */
+angular.module('Bastion.hosts').factory('HostBulkAction',
+    ['BastionResource', function (BastionResource) {
+
+        return BastionResource('/api/v2/hosts/bulk/:action', {}, {
+            addHostCollections: {method: 'PUT', params: {action: 'add_host_collections'}},
+            removeHostCollections: {method: 'PUT', params: {action: 'remove_host_collections'}},
+            addSubscriptions: {method: 'PUT', params: {action: 'add_subscriptions'}},
+            removeSubscriptions: {method: 'PUT', params: {action: 'remove_subscriptions'}},
+            installableErrata: {method: 'POST', params: {action: 'installable_errata'}},
+            installContent: {method: 'PUT', params: {action: 'install_content'}},
+            updateContent: {method: 'PUT', params: {action: 'update_content'}},
+            removeContent: {method: 'PUT', params: {action: 'remove_content'}},
+            destroyHosts: {method: 'PUT', params: {action: 'destroy'}},
+            environmentContentView: {method: 'PUT', params: {action: 'environment_content_view'}},
+            availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}}
+        });
+
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-erratum.factory.js

@@ -18,6 +18,7 @@ angular.module('Bastion.hosts').factory('HostErratum',
                 });
                 return data;
             }},
+            regenerateApplicability: {method: 'PUT', isArray: false, params: {action: 'applicability'}},
             autocomplete: {method: 'GET', isArray: true, params: {action: 'auto_complete_search'}},
             apply: {method: 'PUT', params: {action: 'apply'}}
         });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js

@@ -10,6 +10,7 @@
 angular.module('Bastion.hosts').factory('Host',
     ['BastionResource', function (BastionResource) {
         var resource = BastionResource('/api/v2/hosts/:id/:action', {id: '@id'}, {
+            postIndex: {method: 'POST', params: {action: 'post_index'}},
             update: {method: 'PUT'},
             updateHostCollections: {method: 'PUT', params: {action: 'host_collections'}},
             autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
@@ -23,30 +24,3 @@ angular.module('Bastion.hosts').factory('Host',
         return resource;
     }]
 );
-
-/**
- * @ngdoc service
- * @name  Bastion.hosts.factory:HostBulkAction
- *
- * @requires BastionResource
- *
- * @description
- *   Provides a BastionResource for bulk actions on hosts.
- */
-angular.module('Bastion.hosts').factory('HostBulkAction',
-    ['BastionResource', function (BastionResource) {
-
-        return BastionResource('/api/v2/hosts/bulk/:action', {}, {
-            addHostCollections: {method: 'PUT', params: {action: 'add_host_collections'}},
-            installableErrata: {method: 'POST', params: {action: 'installable_errata'}},
-            removeHostCollections: {method: 'PUT', params: {action: 'remove_host_collections'}},
-            installContent: {method: 'PUT', params: {action: 'install_content'}},
-            updateContent: {method: 'PUT', params: {action: 'update_content'}},
-            removeContent: {method: 'PUT', params: {action: 'remove_content'}},
-            destroyHosts: {method: 'PUT', params: {action: 'destroy'}},
-            environmentContentView: {method: 'PUT', params: {action: 'environment_content_view'}},
-            availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}}
-        });
-
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/hosts.module.js

@@ -8,5 +8,7 @@
 angular.module('Bastion.hosts', [
     'ngResource',
     'ui.router',
-    'Bastion'
+    'Bastion',
+    'Bastion.i18n',
+    'Bastion.components'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organization.factory.js

@@ -21,7 +21,6 @@ angular.module('Bastion.organizations').factory('Organization',
                 },
                 repoDiscover: { method: 'POST', params: {action: 'repo_discover'}},
                 cancelRepoDiscover: {method: 'POST', params: {action: 'cancel_repo_discover'}},
-                autoAttachSubscriptions: {method: 'POST', params: {action: 'autoattach_subscriptions'}},
                 paths: {
                     method: 'GET',
                     url: '/katello/api/v2/organizations/:id/environments/paths',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organizations.module.js

@@ -7,5 +7,8 @@
  */
 angular.module('Bastion.organizations', [
     'ngResource',
-    'Bastion'
+    'ui.router',
+    'Bastion',
+    'Bastion.i18n',
+    'Bastion.components'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/ostree-branches-details-repositories.controller.js

@@ -0,0 +1,60 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.ostree-branches.controller:OstreeBranchesDetailsRepositoriesController
+ *
+ * @requires $scope
+ * @requires $q
+ * @requires Nutupane
+ * @requires Repository
+ * @requires Environment
+ * @requires ContentView
+ * @requires CurrentOrganization
+ *
+ * @description
+ *   Provides the functionality for the OSTree branch repositories page.
+ */
+angular.module('Bastion.ostree-branches').controller('OstreeBranchesDetailsRepositoriesController',
+    ['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization',
+    function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization) {
+        var repositoriesNutupane, environment, contentView, params;
+        params = {
+            'ostree_branch_id': $scope.$stateParams.branchId,
+            'organization_id': CurrentOrganization,
+            'paged': false
+        };
+
+        repositoriesNutupane = new Nutupane(Repository, params);
+        $scope.detailsTable = repositoriesNutupane.table;
+        $scope.detailsTable.initialLoad = false;
+        repositoriesNutupane.masterOnly = true;
+        repositoriesNutupane.setSearchKey('repositoriesSearch');
+
+        environment = Environment.queryUnpaged(function (response) {
+            $scope.environments = response.results;
+            $scope.environmentFilter = _.findWhere($scope.environments, {library: true}).id;
+        });
+
+        contentView = ContentView.queryUnpaged(function (response) {
+            $scope.contentViews = response.results;
+            $scope.contentViewFilter = _.findWhere($scope.contentViews, {'default': true});
+        });
+
+        $scope.detailsTable.working = true;
+        $q.all([contentView.$promise, environment.$promise]).then(function () {
+            $scope.filterBranches();
+            $scope.detailsTable.working = false;
+        });
+
+        $scope.filterBranches = function () {
+            params['environment_id'] = $scope.environmentFilter;
+            params['content_view_version_id'] = $scope.contentViewFilter;
+
+            if ($scope.contentViewFilter) {
+                params['content_view_version_id'] = _.pluck($scope.contentViewFilter.versions, 'id');
+            }
+
+            repositoriesNutupane.setParams(params);
+            repositoriesNutupane.refresh();
+        };
+    }]
+);