katello 3.3.0.rc1.1 → 3.3.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-group-filter.html

@@ -1,40 +1,37 @@
 <span page-title ng-model="filter">{{ 'Package Group Filter:' | translate }} {{ filter.name }}</span>
 
 <div class="details details-full">
-
-  <div data-block="messages" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <nav>
     <ul class="nav nav-tabs">
 
-      <li ng-class="{active: isState('content-views.details.filters.details.package_group.edit')}">
-        <a ui-sref="content-views.details.filters.details.package_group.edit">
+      <li ng-class="{active: isState('content-view.filter.package_group.edit')}">
+        <a ui-sref="content-view.filter.package_group.edit">
         <span translate>
 	  Details
         </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.filters.details.package_group.list')}">
-        <a ui-sref="content-views.details.filters.details.package_group.list({filterId: filter.id})">
+      <li ng-class="{active: isState('content-view.filter.package_group.list')}">
+        <a ui-sref="content-view.filter.package_group.list({filterId: filter.id})">
         <span translate>
           List/Remove
         </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.filters.details.package_group.available')}"
+      <li ng-class="{active: isState('content-view.filter.package_group.available')}"
           ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-views.details.filters.details.package_group.available({filterId: filter.id})">
+        <a ui-sref="content-view.filter.package_group.available({filterId: filter.id})">
         <span translate>
           Add
         </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.filters.details.package_group.repositories')}"
+      <li ng-class="{active: isState('content-view.filter.package_group.repositories')}"
           ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-views.details.filters.details.package_group.repositories({filterId: filter.id})"
+        <a ui-sref="content-view.filter.package_group.repositories({filterId: filter.id})"
            ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
         </a>
       </li>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.controller.js

@@ -21,7 +21,7 @@ angular.module('Bastion.content-views').controller('ContentViewHistoryController
         });
 
         nutupane.table.closeItem = function () {};
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.actionText = function (history) {
             var message,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/views/content-view-history.html

@@ -1,14 +1,17 @@
 <span page-title ng-model="contentView">{{ 'History for Content View:' | translate }} {{ contentView.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
+<header data-block="sub-header">
+  <h3 translate>Promotion History</h3>
+</header>
 
-  <div data-block="header" translate>Promotion History</div>
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+     There is currently no history associated with this Content View.
+  </span>
 
-  <div data-block="messages"></div>
-  <div data-block="selection-summary"></div>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered" ng-class="{'table-mask': detailsTable.working}">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
      <thead>
        <tr bst-table-head>
          <th translate>Date</th>
@@ -21,7 +24,7 @@
      </thead>
 
      <tbody>
-       <tr bst-table-row ng-repeat="history in detailsTable.rows">
+       <tr bst-table-row ng-repeat="history in table.rows">
          <td bst-table-cell>{{ history.created_at | date:'short' }}</td>
          <td bst-table-cell>{{ history.version }} </td>
          <td bst-table-cell class="preserve-newlines">{{ history.description }}</td>
@@ -32,5 +35,4 @@
      </tbody>
     </table>
   </div>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-names.controller.js

@@ -19,9 +19,9 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleNames
             'availablePuppetModuleNames'
         );
         nutupane.masterOnly = true;
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
 
-        $scope.detailsTable.fetchAutocomplete = function (term) {
+        $scope.table.fetchAutocomplete = function (term) {
             var promise;
 
             promise = PuppetModule.autocomplete({'organization_id': CurrentOrganization, search: term}).$promise;
@@ -32,7 +32,7 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleNames
         };
 
         $scope.selectVersion = function (moduleName) {
-            $scope.transitionTo('content-views.details.puppet-modules.versions',
+            $scope.transitionTo('content-view.puppet-modules.versions',
                 {
                     contentViewId: $scope.$stateParams.contentViewId,
                     moduleName: moduleName

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-versions.controller.js

@@ -4,29 +4,27 @@
  *
  * @requires $scope
  * @requires translate
+ * @requires Nutupane
  * @requires ContentView
  * @requires ContentViewPuppetModule
+ * @requires GlobalNotification
  *
  * @description
  *   Provides the ability to select a version of a Puppet Module for a Content View.
  */
 angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersionsController',
-    ['$scope', 'translate', 'ContentView', 'ContentViewPuppetModule',
-    function ($scope, translate, ContentView, ContentViewPuppetModule) {
-        var success, error;
+    ['$scope', 'translate', 'Nutupane', 'ContentView', 'ContentViewPuppetModule', 'GlobalNotification',
+    function ($scope, translate, Nutupane, ContentView, ContentViewPuppetModule, GlobalNotification) {
+        var success, error, nutupane, params;
 
-        $scope.versionsLoading = true;
-        $scope.successMessages = [];
-        $scope.erroressages = [];
+        params = {
+            name: $scope.$stateParams.moduleName,
+            id: $scope.$stateParams.contentViewId
+        };
 
-        $scope.versions = ContentView.availablePuppetModules(
-            {
-                name: $scope.$stateParams.moduleName,
-                id: $scope.$stateParams.contentViewId
-            }, function () {
-                $scope.versionsLoading = false;
-            }
-        );
+        nutupane = new Nutupane(ContentView, params, 'availablePuppetModules');
+        nutupane.masterOnly = true;
+        $scope.table = nutupane.table;
 
         $scope.selectVersion = function (module) {
             var contentViewPuppetModule, contentViewPuppetModuleData = {
@@ -36,10 +34,6 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersi
                 name: module.name
             };
 
-            if (module.useLatest) {
-                contentViewPuppetModuleData.uuid = null;
-            }
-
             contentViewPuppetModule = new ContentViewPuppetModule(contentViewPuppetModuleData);
 
             if ($scope.$stateParams.moduleId) {
@@ -51,14 +45,14 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersi
         };
 
         success = function () {
-            $scope.transitionTo('content-views.details.puppet-modules.list',
+            $scope.transitionTo('content-view.puppet-modules.list',
                 {contentViewId: $scope.$stateParams.contentViewId});
-            $scope.successMessages = [translate('Puppet module added to Content View')];
+            GlobalNotification.setSuccessMessage(translate('Puppet module added to Content View'));
         };
 
         error = function (response) {
             angular.forEach(response.data.errors, function (errorMessage) {
-                $scope.errorMessages.push(translate("An error occurred updating the Content View: ") + errorMessage);
+                GlobalNotification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
             });
         };
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-modules.controller.js

@@ -6,22 +6,21 @@
  * @requires translate
  * @requires Nutupane
  * @requires ContentViewPuppetModule
+ * @requires GlobalNotification
  *
  * @description
  *   Provides functionality to the Content View existing Puppet Modules list.
  */
 angular.module('Bastion.content-views').controller('ContentViewPuppetModulesController',
-    ['$scope', 'translate', 'Nutupane', 'ContentViewPuppetModule',
-    function ($scope, translate, Nutupane, ContentViewPuppetModule) {
+    ['$scope', 'translate', 'Nutupane', 'ContentViewPuppetModule', 'GlobalNotification',
+    function ($scope, translate, Nutupane, ContentViewPuppetModule, GlobalNotification) {
         var nutupane = new Nutupane(ContentViewPuppetModule, {
             contentViewId: $scope.$stateParams.contentViewId
         });
 
         nutupane.masterOnly = true;
 
-        $scope.detailsTable = nutupane.table;
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
+        $scope.table = nutupane.table;
 
         $scope.versionText = function (module) {
             var version;
@@ -37,7 +36,7 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModulesCont
         };
 
         $scope.selectNewVersion = function (module) {
-            $scope.transitionTo('content-views.details.puppet-modules.versionsForModule',
+            $scope.transitionTo('content-view.puppet-modules.versionsForModule',
                 {
                     contentViewId: $scope.$stateParams.contentViewId,
                     moduleName: module.name,
@@ -50,14 +49,14 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModulesCont
             var success, error;
 
             success = function () {
-                $scope.successMessages = [translate('Module %s removed from Content View.')
-                    .replace('%s', module.name)];
+                GlobalNotification.setSuccessMessage(translate('Module %s removed from Content View.')
+                    .replace('%s', module.name));
                 nutupane.removeRow(module.id);
             };
 
             error = function (response) {
                 angular.forEach(response.data.errors, function (errorMessage) {
-                    $scope.errorMessages = [translate("An error occurred updating the Content View: ") + errorMessage];
+                    GlobalNotification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
                 });
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-names.html

@@ -1,49 +1,37 @@
 <span page-title ng-model="contentView">{{ 'Available Puppet Modules for Content View:' | translate }} {{ contentView.name }}</span>
 
-<ol class="breadcrumb">
-  <li class="active">
-    <a ui-sref="content-views.details.puppet-modules.list">
-      {{ "Module List" | translate }}
-    </a>
-  </li>
-</ol>
-
-<div data-extend-template="layouts/details-nutupane.html">
-  <div class="loading-mask loading-mask-panel" ng-show="namesLoading">
-    <i class="fa fa-spinner fa-spin"></i>
-    {{ "Loading..." | translate }}
-  </div>
-
-  <a ui-sref="content-views.details.puppet-modules.list" >
-    <i class="fa fa-double-angle-left"></i>
-    {{ "Back to Module List" | translate }}
-  </a>
-
-  <span data-block="header" translate>Select A New Puppet Module To Add</span>
-  <span data-block="messages"></span>
-  <div data-block="search">
-    <div class="input-group input-group">
-    <input type="text"
-           class="form-control"
-           placeholder="{{ 'Search...' | translate }}"
-           ng-model="detailsTable.searchTerm"
-           bst-on-enter="detailsTable.search(detailsTable.searchTerm)"
-           ng-trim="false"
-           uib-typeahead="item.label for item in detailsTable.fetchAutocomplete($viewValue)"
-           typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
-    <span class="input-group-btn">
-      <button ng-click="detailsTable.search(detailsTable.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
-    </span>
-    </div>
-  </div>
-
-  <span data-block="selection-summary"></span>
-  <span data-block="no-rows-message" translate>No puppet modules found</span>
+<header data-block="sub-header">
+  <h3 translate>
+    Select A New Puppet Module To Add
+  </h3>
+</header>
+
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    No puppet modules found
+  </span>
 
   <span data-block="no-search-results-message" translate>
     Your search returned zero Puppet Modules.
   </span>
 
+  <div data-block="search">
+    <div class="col-sm-3">
+      <div class="input-group">
+        <input type="text"
+               class="form-control"
+               placeholder="{{ 'Filter...' | translate }}"
+               ng-model="table.searchTerm"
+               bst-on-enter="table.search(table.searchTerm)"
+               ng-trim="false"
+               uib-typeahead="item.label for item in table.fetchAutocomplete($viewValue)"
+               typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
+        <span class="input-group-btn">
+          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
+        </span>
+      </div>
+    </div>
+  </div>
 
   <div data-block="table">
     <table class="table table-striped table-bordered">
@@ -55,7 +43,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="item in detailsTable.rows | filter:filterTerm">
+        <tr bst-table-row ng-repeat="item in table.rows">
           <td >{{ item.name }}</td>
           <td  class="action-cell">
             <button translate
@@ -69,4 +57,3 @@
     </table>
   </div>
 </div>
-

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-versions.html

@@ -1,37 +1,40 @@
 <span page-title ng-model="$stateParams">{{ 'Versions for Puppet Module:' | translate }} {{ $stateParams.moduleName }}</span>
 
-<div class="details details-full">
-  <div class="loading-mask loading-mask-panel" ng-show="versionsLoading">
-    <i class="fa fa-spinner fa-spin"></i>
-    {{ "Loading..." | translate }}
-  </div>
+<header data-block="sub-header">
+  <h3 translate>
+    Select an Available Version of {{ $stateParams.moduleName }}
+  </h3>
+</header>
 
-  <ol class="breadcrumb">
-    <li>
-      <a ui-sref="content-views.details.puppet-modules.list">
-        {{ "Module List" | translate }}
-      </a>
-    </li>
-    <li>
-      <a ui-sref="content-views.details.puppet-modules.names">
-        {{ "Select Module" | translate }}
-      </a>
-    </li>
-    <li class="active">
-      {{ $stateParams.moduleName }}
-    </li>
-  </ol>
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    No versions found for {{ $stateParams.moduleName }}
+  </span>
 
-  <h3 translate>Select an Available Version of {{ $stateParams.moduleName }}</h3>
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero versions for {{ $stateParams.moduleName }}
+  </span>
 
-  <div class="details-header">
-    <input type="text"
-           class="form-control filter-input"
-           placeholder="{{ 'Filter' | translate }}"
-           ng-model="filterTerm"/>
+  <div data-block="search">
+    <div class="col-sm-3">
+      <div class="input-group">
+        <input type="text"
+               class="form-control"
+               placeholder="{{ 'Filter...' | translate }}"
+               ng-model="table.searchTerm"
+               bst-on-enter="table.search(table.searchTerm)"
+               ng-trim="false"
+               typeahead="item.label for item in table.fetchAutocomplete($viewValue)"
+               typeahead-empty
+               typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
+        <span class="input-group-btn">
+          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
+        </span>
+      </div>
+    </div>
   </div>
 
-  <table class="table table-striped table-bordered" bst-table="table" ng-class="{'table-mask': table.working}">
+  <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>
         <th bst-table-column><span translate>Author</span></th>
@@ -43,7 +46,7 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="item in versions.results | filter:filterTerm | orderBy: ['author', '-version']">
+      <tr bst-table-row ng-repeat="item in table.rows | orderBy: ['author', '-version']">
         <td bst-table-cell >{{ item.author }}</td>
         <td bst-table-cell >{{ item.version }}</td>
         <td bst-table-cell >{{ item.summary }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-modules.html

@@ -1,15 +1,12 @@
 <span page-title ng-model="contentView">{{ 'Puppet Modules for Content View:' | translate }} {{ contentView.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
-  <span data-block="messages"></span>
-
+<div data-extend-template="layouts/partials/table.html">
   <span data-block="header" translate>Currently Selected Puppet Modules</span>
 
-  <div data-block="actions">
-    <button class="btn btn-primary fr"
+  <div data-block="list-actions">
+    <button class="btn btn-default"
             ng-hide="denied('edit_content_views', contentView)"
-            ui-sref="content-views.details.puppet-modules.names">
-      <i class="fa fa-plus"></i>
+            ui-sref="content-view.puppet-modules.names">
       <span translate>Add New Module</span>
     </button>
   </div>
@@ -23,7 +20,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0">
+    <table class="table table-striped table-bordered">
       <thead>
         <tr bst-table-head>
           <th bst-table-column><span translate>Name</span></th>
@@ -34,7 +31,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="contentViewPuppetModule in detailsTable.rows | filter:filterTerm">
+        <tr bst-table-row ng-repeat="contentViewPuppetModule in table.rows | filter:filterTerm">
           <td bst-table-cell >{{ contentViewPuppetModule.name}}</td>
           <td bst-table-cell >{{ contentViewPuppetModule.author}}</td>
           <td bst-table-cell >{{ versionText(contentViewPuppetModule) }}</td>