katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/{puppet-modules-details-content-views.controller.js → puppet-module-content-views.controller.js}

@@ -2,12 +2,12 @@
 
     /**
      * @ngdoc object
-     * @name  Bastion.puppet-modules.controller:PuppetModulesDetailsContentViewsController
+     * @name  Bastion.puppet-modules.controller:PuppetModuleContentViewsController
      *
      * @description
      *   Provides the functionality for the puppet modules details contentViews page.
      */
-    function PuppetModulesDetailsContentViewsController($scope, Nutupane, ContentViewVersion, CurrentOrganization) {
+    function PuppetModuleContentViewsController($scope, Nutupane, ContentViewVersion, CurrentOrganization) {
         var contentViewsNutupane,
             params = {
                 'puppet_module_id': $scope.$stateParams.puppetModuleId,
@@ -15,10 +15,11 @@
             };
 
         contentViewsNutupane = new Nutupane(ContentViewVersion, params);
+        $scope.controllerName = 'katello_content_views';
         contentViewsNutupane.masterOnly = true;
         contentViewsNutupane.setSearchKey('contentViewsSearch');
 
-        $scope.detailsTable = contentViewsNutupane.table;
+        $scope.table = contentViewsNutupane.table;
 
         $scope.environmentNames = function (environments) {
             var names = _.map(environments, function (environment) {
@@ -31,9 +32,9 @@
 
     angular
         .module('Bastion.puppet-modules')
-        .controller('PuppetModulesDetailsContentViewsController', PuppetModulesDetailsContentViewsController);
+        .controller('PuppetModuleContentViewsController', PuppetModuleContentViewsController);
 
-    PuppetModulesDetailsContentViewsController.$inject = [
+    PuppetModuleContentViewsController.$inject = [
         '$scope',
         'Nutupane',
         'ContentViewVersion',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/{puppet-modules-details-repositories.controller.js → puppet-module-repositories.controller.js}

@@ -2,12 +2,12 @@
 
     /**
      * @ngdoc object
-     * @name  Bastion.puppet-modules.controller:PuppetModulesDetailsRepositoriesController
+     * @name  Bastion.puppet-modules.controller:PuppetModuleRepositoriesController
      *
      * @description
      *   Provides the functionality for the puppet modules details repositories page.
      */
-    function PuppetModulesDetailsRepositoriesController($scope, Nutupane, Repository, CurrentOrganization) {
+    function PuppetModuleRepositoriesController($scope, Nutupane, Repository, CurrentOrganization) {
         var repositoriesNutupane,
             params = {
                 'puppet_module_id': $scope.$stateParams.puppetModuleId,
@@ -15,17 +15,18 @@
             };
 
         repositoriesNutupane = new Nutupane(Repository, params);
+        $scope.controllerName = 'katello_repositories';
         repositoriesNutupane.masterOnly = true;
         repositoriesNutupane.setSearchKey('repositoriesSearch');
 
-        $scope.detailsTable = repositoriesNutupane.table;
+        $scope.table = repositoriesNutupane.table;
     }
 
     angular
         .module('Bastion.puppet-modules')
-        .controller('PuppetModulesDetailsRepositoriesController', PuppetModulesDetailsRepositoriesController);
+        .controller('PuppetModuleRepositoriesController', PuppetModuleRepositoriesController);
 
-    PuppetModulesDetailsRepositoriesController.$inject = [
+    PuppetModuleRepositoriesController.$inject = [
         '$scope',
         'Nutupane',
         'Repository',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/{puppet-modules-details.controller.js → puppet-module.controller.js}

@@ -2,12 +2,12 @@
 
     /**
      * @ngdoc object
-     * @name  Bastion.puppet-modules.controller:PuppetModulesDetailsController
+     * @name  Bastion.puppet-modules.controller:PuppetModuleController
      *
      * @description
      *   Provides the functionality for the puppet modules details action pane.
      */
-    function PuppetModulesDetailsController($scope, PuppetModule, ApiErrorHandler) {
+    function PuppetModuleController($scope, PuppetModule, ApiErrorHandler) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
 
@@ -30,8 +30,8 @@
 
     angular
         .module('Bastion.puppet-modules')
-        .controller('PuppetModulesDetailsController', PuppetModulesDetailsController);
+        .controller('PuppetModuleController', PuppetModuleController);
 
-    PuppetModulesDetailsController.$inject = ['$scope', 'PuppetModule', 'ApiErrorHandler'];
+    PuppetModuleController.$inject = ['$scope', 'PuppetModule', 'ApiErrorHandler'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/views/{puppet-modules-details-content-views.html → puppet-module-content-views.html}

@@ -1,14 +1,20 @@
 <span page-title ng-model="puppetModule">{{ 'Content Views for Puppet Module: ' | translate }} {{ puppetModule.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
+<h3 translate>Content Views that contain this Puppet Module</h3>
 
-  <div data-block="actions"></div>
-  <div data-block="selection-summary"></div>
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    No Content Views contain this Puppet Module
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Content Views
+  </span>
 
   <div data-block="table">
     <table class="table table-striped table-bordered"
-           ng-class="{'table-mask': detailsTable.working}"
-           ng-show="detailsTable.rows.length > 0">
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name"><span translate>Name</span></th>
@@ -18,7 +24,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="version in detailsTable.rows">
+        <tr bst-table-row ng-repeat="version in table.rows">
           <td bst-table-cell>
             <a ui-sref="content-view.info({contentViewId: version.content_view.id})">
               {{ version.content_view.name }}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/views/puppet-module-info.html

@@ -0,0 +1,32 @@
+<span page-title ng-model="puppetModule">{{ 'Puppet Module: ' | translate }} {{ puppetModule.title }}</span>
+
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
+    <h4 translate>Basic Information</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Author</dt>
+      <dd>{{ puppetModule.author }}</dd>
+
+      <dt translate>Version</dt>
+      <dd>{{ puppetModule.version }}</dd>
+
+      <dt translate>Source</dt>
+      <dd>{{ puppetModule.source }}</dd>
+
+      <dt translate>Project Page</dt>
+      <dd>
+        <a ng-href="{{ puppetModule.project_page }}" target="_blank">{{ puppetModule.project_page }}</a>
+      </dd>
+
+      <dt translate>License</dt>
+      <dd>{{ puppetModule.license }}</dd>
+
+      <dt translate>Description</dt>
+      <dd>{{ puppetModule.description }}</dd>
+
+      <dt translate>Summary</dt>
+      <dd>{{ puppetModule.summary }}</dd>
+    </dl>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/views/{puppet-modules-details-repositories.html → puppet-module-repositories.html}

@@ -1,18 +1,20 @@
 <span page-title ng-model="puppetModule">{{ 'Repositories for Puppet Module: ' | translate }} {{ puppetModule.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
+<h3 translate>Library Repositories that contain this Puppet Module.</h3>
 
-  <div data-block="header">
-    <p translate>Library repositories that contain this puppet module.</p>
-  </div>
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    No Repositories contain this Puppet Module
+  </span>
 
-  <div data-block="actions"></div>
-  <div data-block="selection-summary"></div>
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Repositories
+  </span>
 
   <div data-block="table">
     <table class="table table-striped table-bordered"
-           ng-class="{'table-mask': detailsTable.working}"
-           ng-show="detailsTable.rows.length > 0">
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name"><span translate>Name</span></th>
@@ -22,7 +24,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="repository in detailsTable.rows">
+        <tr bst-table-row ng-repeat="repository in table.rows">
           <td bst-table-cell>
             <a ng-href="/products/{{ repository.product.id }}/repositories/{{ repository.library_instance_id || repository.id }}">
               {{ repository.name }}

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

@@ -0,0 +1,37 @@
+<span page-title ng-model="puppetModule">{{ 'Puppet Module: ' | translate }} {{ puppetModule.name }}</span>
+
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <div data-block="header" translate>
+    {{ puppetModule.name }}
+  </div>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('puppet-module.info')}">
+        <a ui-sref="puppet-module.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-show="permitted('view_products')" ng-class="{active: isState('puppet-module.repositories')}">
+        <a ui-sref="puppet-module.repositories">
+          <span translate>
+            Library Repositories
+          </span>
+        </a>
+      </li>
+      <li ng-show="permitted('view_content_views')" ng-class="{active: isState('puppet-module.content-views')}">
+        <a ui-sref="puppet-module.content-views">
+          <span translate>
+            Content Views
+          </span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div data-block="content">
+    <section ui-view></section>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-modules.controller.js

@@ -19,12 +19,11 @@
         };
 
         nutupane = new Nutupane(PuppetModule, params);
-        $scope.table = nutupane.table;
         $scope.controllerName = 'katello_puppet_modules';
+        nutupane.masterOnly = true;
 
-        $scope.table.closeItem = function () {
-            $scope.transitionTo('puppet-modules.index');
-        };
+        $scope.table = nutupane.table;
+        $scope.controllerName = 'katello_puppet_modules';
     }
 
     angular

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-modules.routes.js

@@ -12,52 +12,54 @@
      */
     function PuppetModulesConfig($stateProvider) {
         $stateProvider.state('puppet-modules', {
-            abstract: true,
-            controller: 'PuppetModulesController',
-            templateUrl: 'puppet-modules/views/puppet-modules.html'
-        })
-        .state('puppet-modules.index', {
             url: '/puppet_modules',
             permission: ['view_products', 'view_content_views'],
             views: {
-                'table': {
-                    templateUrl: 'puppet-modules/views/puppet-modules-table-full.html'
+                '@': {
+                    controller: 'PuppetModulesController',
+                    templateUrl: 'puppet-modules/views/puppet-modules.html'
                 }
+            },
+            ncyBreadcrumb: {
+                label: "{{ 'Puppet Modules' | translate }}"
             }
         })
-        .state('puppet-modules.details', {
+        .state('puppet-module', {
+            abstract: true,
             url: '/puppet_modules/:puppetModuleId',
             permission: ['view_products', 'view_content_views'],
-            collapsed: true,
-            views: {
-                'table': {
-                    templateUrl: 'puppet-modules/views/puppet-modules-table-collapsed.html'
-                },
-                'action-panel': {
-                    controller: 'PuppetModulesDetailsController',
-                    templateUrl: 'puppet-modules/details/views/puppet-modules-details.html'
-                }
-            }
+            controller: 'PuppetModuleController',
+            templateUrl: 'puppet-modules/details/views/puppet-module.html'
         })
-        .state('puppet-modules.details.info', {
-            url: '/info',
-            collapsed: true,
+        .state('puppet-module.info', {
+            url: '',
             permission: ['view_products', 'view_content_views'],
-            templateUrl: 'puppet-modules/details/views/puppet-modules-details-info.html'
+            templateUrl: 'puppet-modules/details/views/puppet-module-info.html',
+            ncyBreadcrumb: {
+                label: "{{ puppetModule.name }}",
+                parent: 'puppet-modules'
+            }
         })
-        .state('puppet-modules.details.repositories', {
+        .state('puppet-module.repositories', {
             url: '/repositories',
-            collapsed: true,
             permission: ['view_products'],
-            controller: 'PuppetModulesDetailsRepositoriesController',
-            templateUrl: 'puppet-modules/details/views/puppet-modules-details-repositories.html'
+            controller: 'PuppetModuleRepositoriesController',
+            templateUrl: 'puppet-modules/details/views/puppet-module-repositories.html',
+            ncyBreadcrumb: {
+                label: "{{ 'Repositories' | translate }}",
+                parent: 'puppet-module.info'
+            }
         })
-        .state('puppet-modules.details.content-views', {
+        .state('puppet-module.content-views', {
             url: '/content_views',
             collapsed: true,
             permission: ['view_content_views'],
-            controller: 'PuppetModulesDetailsContentViewsController',
-            templateUrl: 'puppet-modules/details/views/puppet-modules-details-content-views.html'
+            controller: 'PuppetModuleContentViewsController',
+            templateUrl: 'puppet-modules/details/views/puppet-module-content-views.html',
+            ncyBreadcrumb: {
+                label: "{{ 'Content Views' | translate }}",
+                parent: 'puppet-module.info'
+            }
         });
     }
 

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

@@ -1,12 +1,8 @@
 <span page-title>{{ 'Puppet Modules' | translate }}</span>
 
-<div data-extend-template="layouts/nutupane.html">
-
-  <div data-block="header">
-    {{ 'Puppet Modules' | translate }}
-  </div>
-
-  <div data-block="actions">
+<div data-extend-template="layouts/table-with-header.html">
+  <div data-block="header" translate>
+    Puppet Modules
   </div>
 
   <span data-block="no-rows-message" translate>
@@ -17,4 +13,35 @@
     Your search returned zero Puppet Modules.
   </span>
 
+  <div data-block="table">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="name">{{ "Name" | translate }}</th>
+          <th bst-table-column="product">{{ "Author" | translate }}</th>
+          <th bst-table-column="product">{{ "Version" | translate }}</th>
+          <th bst-table-column="product">{{ "Summary" | translate }}</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="puppetModule in table.rows">
+          <td bst-table-cell>
+            <a ui-sref="puppet-module.info({puppetModuleId: puppetModule.id})">
+              {{ puppetModule.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+            {{ puppetModule.author }}
+          </td>
+          <td bst-table-cell>
+            {{ puppetModule.version }}
+          </td>
+          <td bst-table-cell>
+            {{ puppetModule.summary }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/content-override-helper.service.js

@@ -0,0 +1,47 @@
+(function () {
+    /**
+     * @ngdoc run
+     * @name Bastion.run:ContentOverrideHelper
+     *
+     * @description
+     *  Provides common functionality for repository sets content overrides.
+     */
+    function ContentOverrideHelper() {
+        var self = this;
+
+        this.getContentOverrides = function (productRepositorySets, overrideName, overrideValue, remove) {
+            var contentOverrides = [];
+
+            angular.forEach(productRepositorySets, function (productRepositorySet) {
+                var repositorySet = {
+                    'content_label': productRepositorySet.content.label,
+                    name: overrideName,
+                    value: overrideValue
+                };
+
+                if (remove) {
+                    repositorySet.remove = true;
+                }
+
+                contentOverrides.push(repositorySet);
+            });
+
+            return {'content_overrides': contentOverrides};
+        };
+
+        this.getEnabledContentOverrides = function (productRepositorySets) {
+            return self.getContentOverrides(productRepositorySets, 'enabled', true);
+        };
+
+        this.getDisabledContentOverrides = function (productRepositorySets) {
+            return self.getContentOverrides(productRepositorySets, 'enabled', false);
+        };
+
+        this.getDefaultContentOverrides = function (productRepositorySets) {
+            return self.getContentOverrides(productRepositorySets, 'enabled', false, true);
+
+        };
+    }
+
+    angular.module('Bastion.repository-sets').service('ContentOverrideHelper', ContentOverrideHelper);
+})();