katello 3.1.0.1 → 3.2.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js

@@ -14,8 +14,8 @@
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostSubscription', 'Subscription', 'ContentHost', 'SubscriptionsHelper',
-    function ($scope, $location, translate, Nutupane, CurrentOrganization, Host, HostSubscription, Subscription, ContentHost, SubscriptionsHelper) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostSubscription', 'Subscription', 'SubscriptionsHelper',
+    function ($scope, $location, translate, Nutupane, CurrentOrganization, Host, HostSubscription, Subscription, SubscriptionsHelper) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -36,6 +36,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
         });
 
+        $scope.getAmountSelectorValues = SubscriptionsHelper.getAmountSelectorValues;
+
         $scope.disableAddButton = function () {
             return $scope.detailsTable.numSelected === 0 || $scope.isAdding;
         };
@@ -48,6 +50,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
             HostSubscription.addSubscriptions({id: $scope.$stateParams.hostId, 'subscriptions': selected}, function () {
                 Host.get({id: $scope.$stateParams.hostId}, function (host) {
                     $scope.$parent.host = host;
+                    $scope.table.replaceRow(host);
                     $scope.successMessages.push(translate("Successfully added %s subscriptions.").replace('%s', selected.length));
                     $scope.isAdding = false;
                     $scope.contentNutupane.refresh();
@@ -58,21 +61,5 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
                 $scope.contentNutupane.refresh();
             });
         };
-
-        $scope.amountSelectorValues = function (subscription) {
-            var step, value, values;
-
-            step = subscription['instance_multiplier'];
-            if (!step || step < 1) {
-                step = 1;
-            }
-            values = [];
-            for (value = step; value < subscription.quantity && values.length < 5; value += step) {
-                values.push(value);
-            }
-            values.push(subscription.quantity);
-            return values;
-        };
-
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-base-subscriptions.controller.js

@@ -6,15 +6,14 @@
  * @requires translate
  * @requires CurrentOrganization
  * @requires Subscription
- * @requires ContentHost
  * @requires Nutupane
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostBaseSubscriptionsController',
-    ['$scope', '$location', 'translate', 'CurrentOrganization', 'Subscription', 'ContentHost', 'HostSubscription',
-    function ($scope, $location, translate, CurrentOrganization, Subscription, ContentHost, HostSubscription) {
+    ['$scope', '$location', 'translate', 'CurrentOrganization', 'Subscription', 'HostSubscription',
+    function ($scope, $location, translate, CurrentOrganization, Subscription, HostSubscription) {
 
         function success() {
             $scope.subscription.workingMode = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js

@@ -86,9 +86,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
                 deferred.resolve(response);
                 $scope.host = response;
                 $scope.successMessages.push(translate('Save Successful.'));
+                $scope.table.replaceRow(response);
             }, function (response) {
                 deferred.reject(response);
-                _.each(response.data.errors, function (errorMessage) {
+                _.each(response.data.error.full_messages, function (errorMessage) {
                     $scope.errorMessages.push(translate("An error occurred saving the Content Host: ") + errorMessage);
                 });
             });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js

@@ -6,15 +6,14 @@
  * @requires $location
  * @requires translate
  * @requires Subscription
- * @requires ContentHost
  * @requires SubscriptionsHelper
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'ContentHost', 'HostSubscription', 'SubscriptionsHelper',
-    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, ContentHost, HostSubscription, SubscriptionsHelper) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper',
+    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -51,6 +50,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
                     $scope.$parent.host = host;
                     $scope.contentNutupane.table.selectAll(false);
                     $scope.contentNutupane.refresh();
+                    $scope.table.replaceRow(host);
                     $scope.successMessages.push(translate("Successfully removed %s subscriptions.").replace('%s', selected.length));
                     $scope.isRemoving = false;
                 });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html

@@ -16,6 +16,10 @@
       You currently don't have any Products to subscribe to, you can add Products after selecting 'Products' under 'Content' in the main menu
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Products.
+  </span>
+
   <div data-block="table">
     <table ng-class="{'table-mask': detailsTable.working}"
             class="table table-full">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html

@@ -1,134 +1,133 @@
 <span page-title ng-model="host">{{ 'Content Host:' | translate }} {{ host.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>Content Host {{ host.name }}</h2>
 
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="fl" translate>Content Host {{ host.name }}</h2>
+          <div class="fr">
+            <div bst-modal="unregisterContentHost(host)" model="host">
+              <div data-block="modal-header" translate>
+                Unregister Host "{{host.name}}"?
+              </div>
+              <div data-block="modal-body">
+                <p translate>
+                  Unregister Options:
+                </p>
 
-      <div class="fr">
-        <div bst-modal="unregisterContentHost(host)" model="host">
-          <div data-block="modal-header" translate>
-            Unregister Host "{{host.name}}"?
-          </div>
-          <div data-block="modal-body">
-            <p translate>
-              Unregister Options:
-            </p>
-
-            <p ng-show="host.hasSubscription()">
-              <label>
-                <input name="delete"
-                       ng-model="host.unregisterDelete"
-                       ng-value="false"
-                       type="radio" />
-                Unregister the host as a subscription consumer.  Provisioning and configuration information is preserved.
-              </label>
-            </p>
-            <p>
-              <label>
-                <input name="delete"
-                       ng-model="host.unregisterDelete"
-                       ng-value="true"
-                       type="radio" />
-                Completely deletes the host record and removes all reporting, provisioning, and configuration information.
-              </label>
-            </p>
-          </div>
-        </div>
+                <p ng-show="host.hasSubscription()">
+                  <label>
+                    <input name="delete"
+                           ng-model="host.unregisterDelete"
+                           ng-value="false"
+                           type="radio" />
+                    Unregister the host as a subscription consumer.  Provisioning and configuration information is preserved.
+                  </label>
+                </p>
+                <p>
+                  <label>
+                    <input name="delete"
+                           ng-model="host.unregisterDelete"
+                           ng-value="true"
+                           type="radio" />
+                    Completely deletes the host record and removes all reporting, provisioning, and configuration information.
+                  </label>
+                </p>
+              </div>
+            </div>
 
-        <button class="btn btn-default"
-                ng-disabled="host.deleting"
-                ng-hide="denied('destroy_hosts', host)"
-                ng-click="openModal()" translate>Unregister Host</button>
+            <button class="btn btn-default"
+                    ng-disabled="host.deleting"
+                    ng-hide="denied('destroy_hosts', host)"
+                    ng-click="openModal()" translate>Unregister Host</button>
 
-        <button class="btn btn-default" ui-sref="content-hosts.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-      </div>
-    </header>
+            <button class="btn btn-default" ui-sref="content-hosts.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
+            </button>
+          </div>
+        </header>
 
-    <nav>
-      <ul class="nav nav-tabs">
-        <li ng-class="{active: isState('content-hosts.details.info')}">
-          <a translate
-             ui-sref="content-hosts.details.info">
-            Details
-          </a>
-        </li>
-        <li ng-class="{active: isState('content-hosts.details.provisioning')}"
-            bst-feature-flag="remote_actions">
-          <a translate
-             ui-sref="content-hosts.details.provisioning">
-            Provisioning Details
-          </a>
-        </li>
-        <li class="dropdown"
-            ng-class="{active: stateIncludes('content-hosts.details.subscriptions.list') || stateIncludes('content-hosts.details.subscriptions.add') || stateIncludes('content-hosts.details.events')}">
-          <a class="dropdown-toggle">
-            <span translate>Subscriptions</span>
-            <i class="fa fa-chevron-down"></i>
-          </a>
-          <ul class="dropdown-menu">
-            <li>
-              <a ui-sref="content-hosts.details.subscriptions.list" translate>
-                Subscriptions
+        <nav>
+          <ul class="nav nav-tabs">
+            <li ng-class="{active: isState('content-hosts.details.info')}">
+              <a translate
+                 ui-sref="content-hosts.details.info">
+                Details
+              </a>
+            </li>
+            <li ng-class="{active: isState('content-hosts.details.provisioning')}"
+                bst-feature-flag="remote_actions">
+              <a translate
+                 ui-sref="content-hosts.details.provisioning">
+                Provisioning Details
+              </a>
+            </li>
+            <li class="dropdown"
+                ng-class="{active: stateIncludes('content-hosts.details.subscriptions.list') || stateIncludes('content-hosts.details.subscriptions.add') || stateIncludes('content-hosts.details.events')}">
+              <a class="dropdown-toggle">
+                <span translate>Subscriptions</span>
+                <i class="fa fa-chevron-down"></i>
+              </a>
+              <ul class="dropdown-menu">
+                <li>
+                  <a ui-sref="content-hosts.details.subscriptions.list" translate>
+                    Subscriptions
+                  </a>
+                </li>
+                <li>
+                  <a ui-sref="content-hosts.details.events" translate>
+                    Events
+                  </a>
+                </li>
+              </ul>
+            </li>
+            <li ng-class="{active: $state.includes('content-hosts.details.host-collections')}">
+              <a translate
+                 ui-sref="content-hosts.details.host-collections.list">
+                Host Collections
+              </a>
+            </li>
+            <li ng-class="{active: stateIncludes('content-hosts.details.tasks')}">
+              <a translate
+                 ui-sref="content-hosts.details.tasks.index">
+                Tasks
+              </a>
+            </li>
+            <li ng-class="{active: isState('content-hosts.details.packages')}">
+              <a translate
+                 ui-sref="content-hosts.details.packages">
+                Packages
               </a>
             </li>
-            <li>
-              <a ui-sref="content-hosts.details.events" translate>
-                Events
+            <li ng-class="{active: isState('content-hosts.details.errata.index')}">
+              <a translate
+                 ui-sref="content-hosts.details.errata.index">
+                Errata
+              </a>
+            </li>
+            <li ng-hide="denied('view_products')" ng-class="{active: isState('content-hosts.details.products')}">
+              <a translate
+                 ui-sref="content-hosts.details.products">
+                Product Content
+              </a>
+            </li>
+            <li ng-repeat="menuItem in menuExpander.getMenu('host')">
+              <a href="{{ menuItem.url }}">
+                {{ menuItem.label }}
               </a>
             </li>
           </ul>
-        </li>
-        <li ng-class="{active: $state.includes('content-hosts.details.host-collections')}">
-          <a translate
-             ui-sref="content-hosts.details.host-collections.list">
-            Host Collections
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('content-hosts.details.tasks')}">
-          <a translate
-             ui-sref="content-hosts.details.tasks.index">
-            Tasks
-          </a>
-        </li>
-        <li ng-class="{active: isState('content-hosts.details.packages')}">
-          <a translate
-             ui-sref="content-hosts.details.packages">
-            Packages
-          </a>
-        </li>
-        <li ng-class="{active: isState('content-hosts.details.errata.index')}">
-          <a translate
-             ui-sref="content-hosts.details.errata.index">
-            Errata
-          </a>
-        </li>
-        <li ng-hide="denied('view_products')" ng-class="{active: isState('content-hosts.details.products')}">
-          <a translate
-             ui-sref="content-hosts.details.products">
-            Product Content
-          </a>
-        </li>
-        <li ng-repeat="menuItem in menuExpander.getMenu('host')">
-          <a href="{{ menuItem.url }}">
-            {{ menuItem.label }}
-          </a>
-        </li>
-      </ul>
-    </nav>
+        </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/content-hosts/details/views/content-host-info.html

@@ -1,11 +1,11 @@
 <span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.name }}</span>
 
-<section>
-  <div class="details fl" ng-hide="host.hasContent() || host.hasSubscription()">
-    <div data-extend-template="common/views/registration.html"></div>
-  </div>
+<div class="fl" ng-hide="host.hasSubscription()">
+  <div data-extend-template="common/views/registration.html"></div>
+</div>
 
-  <div class="details fl" ng-show="host.hasContent() || host.hasSubscription()">
+<section>
+  <div class="details fl" ng-show="host.hasSubscription()">
     <section>
       <h4 translate>Basic Information</h4>
 
@@ -61,6 +61,11 @@
         </div>
       </div>
 
+      <div class="detail">
+        <span class="info-label" translate>Registered Through</span>
+        <span class="info-value">{{ host.subscription_facet_attributes.registered_through || "Unknown"}}</span>
+      </div>
+
       <div ng-show="host.subscription_facet_attributes.virtual_host" class="detail">
         <span class="info-label" translate>Virtual Host</span>
         <div class="info-value">
@@ -136,14 +141,14 @@
       </div>
 
       <div class="detail">
-        <span class="info-label" translate>RAM (GB)</span>
+        <span class="info-label" translate>RAM </span>
         <span class="info-value">{{ host.facts["dmi::memory::size"] }}</span>
       </div>
 
       <div class="divider"></div>
     </section>
 
-    <section ng-show="host.hasContent()">
+    <section>
       <h4 translate>Installed Products</h4>
 
       <p translate ng-show="!host.subscription_facet_attributes.installed_products || host.subscription_facet_attributes.installed_products.length == 0">
@@ -160,7 +165,7 @@
     </section>
   </div>
 
-  <div class="fr details" ng-show="host.hasContent()">
+  <div class="fr details" ng-show="host.hasSubscription()">
     <section>
       <h4 translate>Installable Errata</h4>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -25,4 +25,9 @@
   <span data-block="no-rows-message" translate>
     You currently don't have any Content Hosts, you can register one by clicking the button on the right and following the instructions.
   </span>
+
+  <span data-block="no-search-results-message">
+    Your search returned zero Content Hosts.
+  </span>
+  
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.module.js

@@ -9,6 +9,7 @@ angular.module('Bastion.content-views', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.utils',
     'Bastion.content-views.versions',
     'Bastion.components',