katello 3.1.0.1 → 3.2.0.rc1

data/db/migrate/20160906181923_add_puppet_path_to_smart_proxy.rb

@@ -0,0 +1,5 @@
+class AddPuppetPathToSmartProxy < ActiveRecord::Migration
+  def change
+    add_column :smart_proxies, :puppet_path, :text
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.module.js

@@ -9,6 +9,7 @@ angular.module('Bastion.activation-keys', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.utils',
     'Bastion.components',
     'Bastion.host-collections'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-associations.controller.js

@@ -25,12 +25,6 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
             'paged': true
         };
 
-        $scope.table.working = true;
-
-        if ($scope.contentHosts) {
-            $scope.table.working = false;
-        }
-
         contentHostsNutupane = new Nutupane(Host, params);
         contentHostsNutupane.searchTransform = function (term) {
             var searchQuery, addition = "activation_key_id=" + $scope.$stateParams.activationKeyId;
@@ -43,7 +37,14 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
         };
 
         contentHostsNutupane.masterOnly = true;
+        contentHostsNutupane.setSearchKey('contentHostSearch');
+
         $scope.detailsTable = contentHostsNutupane.table;
+        $scope.detailsTable.working = true;
+
+        if ($scope.contentHosts) {
+            $scope.detailsTable.working = false;
+        }
 
         $scope.activationKey.$promise.then(function () {
             contentHostsNutupane.setParams(params);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-add-subscriptions.html

@@ -19,6 +19,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">
       <thead>
@@ -54,13 +58,13 @@
             </span>
             <select ng-hide="!subscription.multi_entitlement"
                     ng-model="subscription.amount"
-                    ng-options="amount for amount in amountSelectorValues(subscription)"
+                    ng-options="amount for amount in getAmountSelectorValues(subscription)"
                     >
               <option value="">{{ "Automatic" | translate }}</option>
             </select>
           </td>
           <td bst-table-cell>{{ subscription | subscriptionConsumedFilter }}</td>
-          <td bst-table-cell subscription-type="subscription"></td>
+          <td bst-table-cell><div subscription-type="subscription"></div></td>
           <td bst-table-cell>{{ subscription.start_date | date:"shortDate" }}</td>
           <td bst-table-cell>{{ subscription.end_date | date:"shortDate" }}</td>
           <td bst-table-cell>{{ subscription.support_level }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -10,6 +10,10 @@
     This activation key is not associated with any content hosts.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Hosts.
+  </span>
+
   <div data-block="table">
     <table class="table table-bordered table-striped" bst-table="table" ng-class="{'table-mask': detailsTable.working}">
       <thead>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -1,118 +1,117 @@
 <span page-title ng-model="activationKey">{{ 'Activation Key:' | translate }} {{ activationKey.name }}</span>
 
-<div class="loading-mask loading-mask-panel fa-3x" 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="pull-left" translate>Activation Key: {{ activationKey.name }}</h2>
 
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="pull-left" translate>Activation Key: {{ activationKey.name }}</h2>
-
-      <div class="details-actions pull-right">
-        <button class="btn btn-default"
-                ng-click="openModal()" ng-hide="denied('destroy_activation_keys', activationKey)" translate>
-          Remove
-        </button>
-
-        <!-- RFE copy activation key - http://projects.theforeman.org/issues/4407 -->
-        <button class="btn btn-default"
-                ng-click="showCopy = true"
-                ng-hide="denied('create_activation_key')">
-          <i class="fa fa-copy"></i>
-          {{ "Copy Activation Key" | translate }}
-        </button>
-
-        <button class="btn btn-default" ui-sref="activation-keys.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-
-        <div bst-modal="removeActivationKey(activationKey)" model="activationKey">
-          <div data-block="modal-header" translate>Remove Activation Key "{{ activationKey.name }}"?</div>
-          <div data-block="modal-body" translate>Are you sure you want to remove Activation Key "{{ activationKey.name }}"?</div>
-        </div>
-      </div>
-    </header>
+          <div class="details-actions pull-right">
+            <button class="btn btn-default"
+                    ng-click="openModal()" ng-hide="denied('destroy_activation_keys', activationKey)" translate>
+              Remove
+            </button>
 
-    <div ng-show="showCopy" class="pull-right 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 }}
+            <!-- RFE copy activation key - http://projects.theforeman.org/issues/4407 -->
+            <button class="btn btn-default"
+                    ng-click="showCopy = true"
+                    ng-hide="denied('create_activation_key')">
+              <i class="fa fa-copy"></i>
+              {{ "Copy Activation Key" | translate }}
             </button>
-            <button class="btn btn-default" ng-click="showCopy = false">
-              {{ "Cancel" | translate }}
+
+            <button class="btn btn-default" ui-sref="activation-keys.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
             </button>
+
+            <div bst-modal="removeActivationKey(activationKey)" model="activationKey">
+              <div data-block="modal-header" translate>Remove Activation Key "{{ activationKey.name }}"?</div>
+              <div data-block="modal-body" translate>Are you sure you want to remove Activation Key "{{ activationKey.name }}"?</div>
+            </div>
           </div>
+        </header>
+
+        <div ng-show="showCopy" class="pull-right 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>
-      <ul class="nav nav-tabs">
-        <li ng-class="{active: isState('activation-keys.details.info')}">
-          <a ui-sref="activation-keys.details.info">
-            <span translate>
-              Details
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('activation-keys.details.subscriptions')}">
-          <a ui-sref="activation-keys.details.subscriptions.list">
-            <span translate>
-              Subscriptions
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('activation-keys.details.products')}">
-          <a ui-sref="activation-keys.details.products">
-            <span translate>
-              Product Content
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('activation-keys.details.host-collections')}">
-          <a ui-sref="activation-keys.details.host-collections.list">
-            <span translate>
-              Host Collections
-            </span>
-          </a>
-        </li>
-        <li class="dropdown"
-            ng-class="{active: stateIncludes('activation-keys.details.associations-content-hosts')}">
-          <a class="dropdown-toggle">
-            <span translate>Associations</span>
-            <i class="fa fa-chevron-down"></i>
-          </a>
-          <ul class="dropdown-menu">
-            <li>
-              <a ui-sref="activation-keys.details.associations-content-hosts({activationKeyId: activationKey.id})" translate>
-                Content Hosts
+        <nav>
+          <ul class="nav nav-tabs">
+            <li ng-class="{active: isState('activation-keys.details.info')}">
+              <a ui-sref="activation-keys.details.info">
+                <span translate>
+                  Details
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: stateIncludes('activation-keys.details.subscriptions')}">
+              <a ui-sref="activation-keys.details.subscriptions.list">
+                <span translate>
+                  Subscriptions
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: stateIncludes('activation-keys.details.products')}">
+              <a ui-sref="activation-keys.details.products">
+                <span translate>
+                  Product Content
+                </span>
               </a>
             </li>
+            <li ng-class="{active: stateIncludes('activation-keys.details.host-collections')}">
+              <a ui-sref="activation-keys.details.host-collections.list">
+                <span translate>
+                  Host Collections
+                </span>
+              </a>
+            </li>
+            <li class="dropdown"
+                ng-class="{active: stateIncludes('activation-keys.details.associations-content-hosts')}">
+              <a class="dropdown-toggle">
+                <span translate>Associations</span>
+                <i class="fa fa-chevron-down"></i>
+              </a>
+              <ul class="dropdown-menu">
+                <li>
+                  <a ui-sref="activation-keys.details.associations-content-hosts({activationKeyId: activationKey.id})" translate>
+                    Content Hosts
+                  </a>
+                </li>
+              </ul>
+            </li>
           </ul>
-        </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/activation-keys/details/views/activation-key-subscriptions-list.html

@@ -30,6 +30,9 @@
        You currently don't have any Subscriptions associated with this Activation Key, 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/activation-keys/new/views/activation-key-new.html

@@ -1,98 +1,97 @@
 <span page-title>{{ 'New Activation Key' | translate }}</span>
 
-<div class="loading-mask loading-mask-panel fa-3x" 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="pull-left" translate>New Activation Key</h2>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <header class="new-header details-header">
-    <h2 class="pull-left" translate>New Activation Key</h2>
-
-    <div class="details-actions pull-right">
-      <button class="btn btn-default" ui-sref="activation-keys.index">
-        <i class="fa fa-remove"></i>
-        {{ "Close" | translate }}
-      </button>
-    </div>
-  </header>
-
-  <form name="activationKeyForm" class="form-horizontal" novalidate role="form">
+        <div class="details-actions pull-right">
+          <button class="btn btn-default" ui-sref="activation-keys.index">
+            <i class="fa fa-remove"></i>
+            {{ "Close" | translate }}
+          </button>
+        </div>
+      </header>
 
-    <div bst-form-group label="{{ 'Name' | translate }}">
-      <input id="name"
-             name="name"
-             ng-model="activationKey.name"
-             type="text"
-             tabindex="1"
-             autofocus
-             required/>
-    </div>
+      <form name="activationKeyForm" class="form-horizontal" novalidate role="form">
 
-    <div bst-form-group label="{{ 'Host Limit' | translate }}" field="max_hosts">
-      <span translate>Unlimited Hosts:</span>
-      <input type="checkbox"
-             name="limit"
-             ng-model="activationKey.unlimited_hosts"/>
+        <div bst-form-group label="{{ 'Name' | translate }}">
+          <input id="name"
+                 name="name"
+                 ng-model="activationKey.name"
+                 type="text"
+                 tabindex="1"
+                 autofocus
+                 required/>
+        </div>
 
-      <div bst-form-group label="{{ 'Limit' | translate }}" ng-hide="activationKey.unlimited_hosts">
-        <input id="max_hosts"
-               name="max_hosts"
-               class="form-control"
-               ng-model="activationKey.max_hosts"
-               ng-required="!activationKey.unlimited_hosts"
-               type="number"
-               min="1"
-               max="2147483648"
-               tabindex="2"/>
-      </div>
-    </div>
+        <div bst-form-group label="{{ 'Host Limit' | translate }}" field="max_hosts">
+          <span translate>Unlimited Hosts:</span>
+          <input type="checkbox"
+                 name="limit"
+                 ng-model="activationKey.unlimited_hosts"/>
 
-    <div bst-form-group label="{{ 'Description' | translate }}">
-      <textarea id="description"
-                name="description"
-                ng-model="activationKey.description"
-                tabindex="3">
-      </textarea>
-    </div>
+          <div bst-form-group label="{{ 'Limit' | translate }}" ng-hide="activationKey.unlimited_hosts">
+            <input id="max_hosts"
+                   name="max_hosts"
+                   class="form-control"
+                   ng-model="activationKey.max_hosts"
+                   ng-required="!activationKey.unlimited_hosts"
+                   type="number"
+                   min="1"
+                   max="2147483648"
+                   tabindex="2"/>
+          </div>
+        </div>
 
-    <span bst-feature-flag="lifecycle_environments">
-      <div class="form-group">
-        <label class="control-label col-sm-2" translate>Environment</label>
-        <div class="col-sm-5 input">
-          <span path-selector="environments"
-                ng-model="activationKey.environment"
-                selection-required="false"
-                mode="singleSelect">
-          </span>
+        <div bst-form-group label="{{ 'Description' | translate }}">
+          <textarea id="description"
+                    name="description"
+                    ng-model="activationKey.description"
+                    tabindex="3">
+          </textarea>
         </div>
-      </div>
 
-      <div bst-form-group label="{{ 'Content View' | translate }}">
-        <select ng-hide="contentViews.length === 0 || activationKey.environment === undefined "
-                id="content_view_id"
-                name="content_view_id"
-                ng-model="activationKey.content_view_id"
-                ng-options="contentView.id as contentView.name for contentView in contentViews"
-                tabindex="4"
-                autofocus>
-        </select>
-        <span class="help-block" ng-show="activationKey.environment !== undefined && contentViews.length === 0" translate>
-          The selected environment contains no Content Views, please select a different environment.
-        </span>
-        <span class="help-block" ng-show="activationKey.environment === undefined" translate>
-          Please select an environment.
+        <span bst-feature-flag="lifecycle_environments">
+          <div class="form-group">
+            <label class="control-label col-sm-2" translate>Environment</label>
+            <div class="col-sm-5 input">
+              <span path-selector="environments"
+                    ng-model="activationKey.environment"
+                    selection-required="false"
+                    mode="singleSelect">
+              </span>
+            </div>
+          </div>
+
+          <div bst-form-group label="{{ 'Content View' | translate }}">
+            <select ng-hide="contentViews.length === 0 || activationKey.environment === undefined "
+                    id="content_view_id"
+                    name="content_view_id"
+                    ng-model="activationKey.content_view_id"
+                    ng-options="contentView.id as contentView.name for contentView in contentViews"
+                    tabindex="4"
+                    autofocus>
+            </select>
+            <span class="help-block" ng-show="activationKey.environment !== undefined && contentViews.length === 0" translate>
+              The selected environment contains no Content Views, please select a different environment.
+            </span>
+            <span class="help-block" ng-show="activationKey.environment === undefined" translate>
+              Please select an environment.
+            </span>
+          </div>
         </span>
-      </div>
-    </span>
 
-    <div bst-form-buttons
-         on-cancel="transitionTo('activation-keys.index')"
-         on-save="save(activationKey)"
-         working="working">
-    </div>
+        <div bst-form-buttons
+             on-cancel="transitionTo('activation-keys.index')"
+             on-save="save(activationKey)"
+             working="working">
+        </div>
 
-  </form>
+      </form>
 
 
-</section>
+    </section>
+  </div>
+</div>