RubyGems - katello - Versions diffs - 3.1.0.1 → 3.2.0.rc1 - Mend

katello 3.1.0.1 → 3.2.0.rc1

Potentially problematic release.

This version of katello might be problematic. Click here for more details.

Files changed (390) hide show

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repositories/new/new-repository.controller.js CHANGED

@@ -27,9 +27,9 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             var foundError = false;
             $scope.working = false;
-            angular.forEach($scope.repositoryForm, function (value, field) {
-                if ($scope.repositoryForm.hasOwnProperty(field) && value.hasOwnProperty('$setValidity')) {
-                    value.$setValidity('server', true);
+            angular.forEach($scope.repositoryForm, function (field) {
+                if ($scope.repositoryForm.hasOwnProperty(field) && field.hasOwnProperty('$modelValue')) {
+                    field.$setValidity('server', true);
                     $scope.repositoryForm[field].$error.messages = [];
                 }
             });
@@ -48,7 +48,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
         }
         $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
-            'checksum_type': null, 'download_policy': null, 'mirror_on_sync': true});
+            'checksum_type': null, 'download_policy': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true});
         Setting.get({"search": "name = default_download_policy"},
             function (data) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repositories/new/views/repository-new.html CHANGED

@@ -65,6 +65,16 @@
       </div>
+      <div bst-form-group label="{{ 'Verify SSL' | translate }}">
+        <input id="verify_ssl_on_sync"
+               name="verify_ssl_on_sync"
+               ng-model="repository.verify_ssl_on_sync"
+               type="checkbox"/>
+        <h6 translate>
+          Selecting this option will result in Katello verifying that the upstream url's SSL certificates are signed by a trusted CA. Unselect if you do not want this verification.
+        </h6>
+      </div>
       <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-show="repository.content_type === 'yum'">
         <select id="download_policy"
                 name="download_policy"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repositories/repositories.module.js CHANGED

@@ -10,6 +10,7 @@ angular.module('Bastion.repositories', [
     'ui.router',
     'ngUpload',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.utils',
     'Bastion.common',
     'Bastion.components',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/settings.module.js CHANGED

@@ -7,6 +7,8 @@
  */
 angular.module('Bastion.settings', [
     'ngResource',
+    'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.common'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-associations-content-hosts.html CHANGED

@@ -1,9 +1,9 @@
-<span page-title ng-model="subscription">{{ 'Content Hosts for Subscription:' | translate }} {{ subscription.name }}</span>
+<span page-title ng-model="subscription">{{ 'Hosts for Subscription:' | translate }} {{ subscription.name }}</span>
 <div class="nutupane">
   <h3 translate>
-    Attached to Content Hosts
+    Attached to Hosts
   </h3>
   <div bst-alert="info" ng-show="!working && contentHosts.length === 0">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-details.html CHANGED

@@ -1,58 +1,57 @@
-<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="pull-left">{{ subscription.name }}</h2>
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="pull-left">{{ subscription.name }}</h2>
+          <div class="fr">
+            <button class="btn btn-default" ui-sref="subscriptions.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
+            </button>
+          </div>
-      <div class="fr">
-        <button class="btn btn-default" ui-sref="subscriptions.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-      </div>
-    </header>
+        </header>
-    <nav>
-      <ul class="nav nav-tabs">
-        <li ng-class="{active: isState('subscriptions.details.info')}">
-          <a translate ui-sref="subscriptions.details.info({subscriptionId: subscription.id})">
-            Details
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('subscriptions.details.products')}">
-          <a translate ui-sref="subscriptions.details.products({subscriptionId: subscription.id})">
-            Product Content
-          </a>
-        </li>
-        <li class="dropdown"
-            ng-class="{active: stateIncludes('subscriptions.details.associations-activation-keys') || stateIncludes('subscriptions.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="subscriptions.details.associations-activation-keys({subscriptionId: subscription.id})" translate>
-                Activation Keys
+        <nav>
+          <ul class="nav nav-tabs">
+            <li ng-class="{active: isState('subscriptions.details.info')}">
+              <a translate ui-sref="subscriptions.details.info({subscriptionId: subscription.id})">
+                Details
               </a>
             </li>
-            <li>
-              <a ui-sref="subscriptions.details.associations-content-hosts({subscriptionId: subscription.id})" translate>
-                Content Hosts
+            <li ng-class="{active: stateIncludes('subscriptions.details.products')}">
+              <a translate ui-sref="subscriptions.details.products({subscriptionId: subscription.id})">
+                Product Content
               </a>
             </li>
+            <li class="dropdown"
+                ng-class="{active: stateIncludes('subscriptions.details.associations-activation-keys') || stateIncludes('subscriptions.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="subscriptions.details.associations-activation-keys({subscriptionId: subscription.id})" translate>
+                    Activation Keys
+                  </a>
+                </li>
+                <li>
+                  <a ui-sref="subscriptions.details.associations-content-hosts({subscriptionId: subscription.id})" translate>
+                    Hosts
+                  </a>
+                </li>
+              </ul>
+            </li>
           </ul>
-        </li>
-      </ul>
-    </nav>
+        </nav>
-    <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/subscriptions/manifest/manifest-import.controller.js CHANGED

@@ -199,6 +199,16 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
             }
         };
+        $scope.uploadError = function (error, content) {
+            if (angular.isString(content) && content.indexOf("Request Entity Too Large")) {
+                error = translate('File too large.');
+            } else {
+                error = content;
+            }
+            $scope.uploadErrorMessages = [translate('Error during upload: ') + error];
+            $scope.progress.uploading = false;
+        };
         $scope.histories = Subscription.manifestHistory();
         $scope.showHistoryMoreLink = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html CHANGED

@@ -53,6 +53,7 @@
   <form role="form"
         action="{{ uploadURL }}"
         ng-upload="uploadManifest(content, completed)"
+        error-catcher="uploadError(error, content)"
         ng-hide="denied('import_manifest')"
         upload-options-enable-controls
         upload-options-enable-rails-csrf>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest.html CHANGED

@@ -1,47 +1,46 @@
-<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>
-<section class="nutupane-details" ng-cloak bst-container-scroll>
+      <header class="details-header">
+        <h2 class="pull-left" translate>Subscription Manifest</h2>
-  <header class="details-header">
-    <h2 class="pull-left" translate>Subscription Manifest</h2>
+        <div class="fr">
+          <button class="btn btn-default" ui-sref="subscriptions.index">
+            <i class="fa fa-remove"></i>
+            {{ "Close" | translate }}
+          </button>
+        </div>
+      </header>
-    <div class="fr">
-      <button class="btn btn-default" ui-sref="subscriptions.index">
-        <i class="fa fa-remove"></i>
-        {{ "Close" | translate }}
-      </button>
-    </div>
-  </header>
+      <nav>
+        <ul class="nav nav-tabs">
+          <li ng-class="{active: isState('subscriptions.manifest.details')}">
+            <a class="clickable"
+               translate
+               ui-sref="subscriptions.manifest.details()">
+              Details
+            </a>
+          </li>
+          <li ng-class="{active: stateIncludes('subscriptions.manifest.import')}">
+            <a class="clickable"
+               translate
+               ui-sref="subscriptions.manifest.import()">
+              Actions
+            </a>
+          </li>
+          <li ng-class="{active: stateIncludes('subscriptions.manifest.history')}">
+            <a class="clickable"
+               translate
+               ui-sref="subscriptions.manifest.history()">
+              Import History
+            </a>
+          </li>
+        </ul>
+      </nav>
-  <nav>
-    <ul class="nav nav-tabs">
-      <li ng-class="{active: isState('subscriptions.manifest.details')}">
-        <a class="clickable"
-           translate
-           ui-sref="subscriptions.manifest.details()">
-          Details
-        </a>
-      </li>
-      <li ng-class="{active: stateIncludes('subscriptions.manifest.import')}">
-        <a class="clickable"
-           translate
-           ui-sref="subscriptions.manifest.import()">
-          Actions
-        </a>
-      </li>
-      <li ng-class="{active: stateIncludes('subscriptions.manifest.history')}">
-        <a class="clickable"
-           translate
-           ui-sref="subscriptions.manifest.history()">
-          Import History
-        </a>
-      </li>
-    </ul>
-  </nav>
+      <section class="nutupane-sub-section" ui-view></section>
-  <section class="nutupane-sub-section" ui-view></section>
-</section>
+    </section>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions-helper.service.js CHANGED

@@ -44,6 +44,21 @@ angular.module('Bastion.subscriptions').service('SubscriptionsHelper',
             return selected;
         };
+        this.getAmountSelectorValues = 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;
+        };
         this.getSelectedSubscriptions = function (table) {
             var selected;
@@ -53,6 +68,5 @@ angular.module('Bastion.subscriptions').service('SubscriptionsHelper',
             });
             return selected;
         };
     }
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.module.js CHANGED

@@ -9,6 +9,7 @@ angular.module('Bastion.subscriptions', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.organizations',
     'Bastion.common',
     'Bastion.components',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscriptions.html CHANGED

@@ -16,4 +16,8 @@
   <span data-block="no-rows-message" translate>
     You currently don't have any Subscriptions, you can add Subscriptions by importing a manifest using the button on the right labeled 'Manage Manifest'.
   </span>
+   <span data-block="no-search-results-message">
+     Your search returned zero Subscriptions.
+   </span>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-details.html CHANGED

@@ -1,65 +1,64 @@
 <span page-title ng-model="syncPlan">{{ 'Sync Plan:' | translate }} {{ syncPlan.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>
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+      <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="fl" translate>Sync Plan {{ syncPlan.name }}</h2>
+      <div ng-hide="panel.error">
+        <header class="details-header">
+          <h2 class="fl" translate>Sync Plan {{ syncPlan.name }}</h2>
-      <div class="fr">
-        <div bst-modal="removeSyncPlan(syncPlan)" model="syncPlan">
-          <div data-block="modal-header" translate>Remove Sync Plan "{{ syncPlan.name }}"?</div>
-          <div data-block="modal-body" translate>Are you sure you want to remove Sync Plan "{{ syncPlan.name }}"?</div>
-        </div>
+          <div class="fr">
+            <div bst-modal="removeSyncPlan(syncPlan)" model="syncPlan">
+              <div data-block="modal-header" translate>Remove Sync Plan "{{ syncPlan.name }}"?</div>
+              <div data-block="modal-body" translate>Are you sure you want to remove Sync Plan "{{ syncPlan.name }}"?</div>
+            </div>
-        <button class="btn btn-default" ng-click="runSyncPlan()" ng-hide="denied('sync_products')">
-          <i class="fa fa-refresh"></i>
-          {{ "Run Sync Plan" | translate }}
-        </button>
-        <button class="btn btn-default" ng-click="openModal()" ng-hide="denied('destroy_sync_plans', syncPlan)">
-          <i class="fa fa-trash-o"></i>
-          {{ "Remove Sync Plan" | translate }}
-        </button>
-        <button class="btn btn-default" ui-sref="sync-plans.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-      </div>
-    </header>
+            <button class="btn btn-default" ng-click="runSyncPlan()" ng-hide="denied('sync_products')">
+              <i class="fa fa-refresh"></i>
+              {{ "Run Sync Plan" | translate }}
+            </button>
+            <button class="btn btn-default" ng-click="openModal()" ng-hide="denied('destroy_sync_plans', syncPlan)">
+              <i class="fa fa-trash-o"></i>
+              {{ "Remove Sync Plan" | translate }}
+            </button>
+            <button class="btn btn-default" ui-sref="sync-plans.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
+            </button>
+          </div>
+        </header>
-    <nav>
-      <ul class="nav nav-tabs">
-        <li ng-class="{active: stateIncludes('sync-plans.details.info')}">
-          <a translate
-             ui-sref="sync-plans.details.info({syncPlanId: syncPlan.id})">
-            Details
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('sync-plans.details.products')}">
-          <a translate
-             ui-sref="sync-plans.details.products.list({syncPlanId: syncPlan.id})">
-            Products
-          </a>
-        </li>
-        <li ng-repeat="menuItem in menuExpander.getMenu('syncPlan')">
-          <a href="{{ menuItem.url }}">
-            {{ menuItem.label }}
-          </a>
-        </li>
-      </ul>
-    </nav>
+        <nav>
+          <ul class="nav nav-tabs">
+            <li ng-class="{active: stateIncludes('sync-plans.details.info')}">
+              <a translate
+                 ui-sref="sync-plans.details.info({syncPlanId: syncPlan.id})">
+                Details
+              </a>
+            </li>
+            <li ng-class="{active: stateIncludes('sync-plans.details.products')}">
+              <a translate
+                 ui-sref="sync-plans.details.products.list({syncPlanId: syncPlan.id})">
+                Products
+              </a>
+            </li>
+            <li ng-repeat="menuItem in menuExpander.getMenu('syncPlan')">
+              <a href="{{ menuItem.url }}">
+                {{ menuItem.label }}
+              </a>
+            </li>
+          </ul>
+        </nav>
-    <div bst-alert="info" ng-show="task">
-      A sync has been initiated in the background, <a href="/foreman_tasks/tasks/{{ task.id }}">click for more details</a>
-    </div>
+        <div bst-alert="info" ng-show="task">
+          A sync has been initiated in the background, <a href="/foreman_tasks/tasks/{{ task.id }}">click for more details</a>
+        </div>
-    <section class="nutupane-sub-section" ui-view></section>
+        <section class="nutupane-sub-section" ui-view></section>
+      </div>
+    </section>
   </div>
-</section>
+</div>