katello 3.6.0.1.rc2 → 3.7.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-file-repositories.controller.js

@@ -14,7 +14,9 @@
      *    Provides UI functionality add file repositories to a content view
      */
     function ContentViewAvailableFileRepositoriesController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -25,7 +27,7 @@
             'content_view_id': $scope.$stateParams.contentViewId,
             'available_for': 'content_view'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.load();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-ostree-repositories.controller.js

@@ -15,8 +15,9 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableOstreeRe
     ['$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil',
     function ($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
 
-        var nutupane;
-
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
         ContentViewRepositoriesUtil($scope);
 
         nutupane = new Nutupane(Repository, {
@@ -26,10 +27,11 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableOstreeRe
             'content_view_id': $scope.$stateParams.contentViewId,
             'available_for': 'content_view'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;
+        nutupane.load();
 
         $scope.table = nutupane.table;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-repositories.controller.js

@@ -17,7 +17,9 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableReposito
     ['$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil',
     function ($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
 
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -28,7 +30,7 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableReposito
             'content_view_id': $scope.$stateParams.contentViewId,
             'available_for': 'content_view'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.load();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-deb-repositories-list.controller.js

@@ -14,7 +14,9 @@
      *    Provides UI functionality list/remove deb repositories from a content view
      */
     function ContentViewDebRepositoriesListController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -23,7 +25,7 @@
             'content_view_id': $scope.$stateParams.contentViewId,
             'content_type': 'deb'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.load();

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

@@ -13,8 +13,8 @@
  *   Provides the functionality specific to the Content View Details page.
  */
 angular.module('Bastion.content-views').controller('ContentViewDetailsController',
-    ['$scope', '$q', 'ContentView', 'translate', 'ApiErrorHandler', 'Notification',
-    function ($scope, $q, ContentView, translate, ApiErrorHandler, Notification) {
+    ['$scope', '$q', 'ContentView', 'translate', 'ApiErrorHandler', 'Notification', 'RepositoryTypesService',
+    function ($scope, $q, ContentView, translate, ApiErrorHandler, Notification, RepositoryTypesService) {
         $scope.saveSuccess = function () {
             Notification.setSuccessMessage(translate('Content View updated.'));
         };
@@ -30,6 +30,8 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
             loading: true
         };
 
+        $scope.repositoryTypeEnabled = RepositoryTypesService.repositoryTypeEnabled;
+
         $scope.taskTypes = {
             publish: "Actions::Katello::ContentView::Publish",
             promotion: "Actions::Katello::ContentView::Promote",

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-docker-repositories-list.controller.js

@@ -14,7 +14,9 @@
      *    Provides UI functionality list/remove docker repositories from a content view
      */
     function ContentViewDockerRepositoriesListController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -23,7 +25,7 @@
             'content_view_id': $scope.$stateParams.contentViewId,
             'content_type': 'docker'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-file-repositories-list.controller.js

@@ -14,7 +14,9 @@
      *    Provides UI functionality list/remove file repositories from a content view
      */
     function ContentViewFileRepositoriesListController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -23,7 +25,7 @@
             'content_view_id': $scope.$stateParams.contentViewId,
             'content_type': 'file'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.load();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-ostree-repositories-list.controller.js

@@ -14,7 +14,9 @@
      *    Provides UI functionality list/remove ostree repositories from a content view
      */
     function ContentViewOstreeRepositoriesListController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -23,7 +25,7 @@
             'content_view_id': $scope.$stateParams.contentViewId,
             'content_type': 'ostree'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-repositories-list.controller.js

@@ -16,7 +16,9 @@
 angular.module('Bastion.content-views').controller('ContentViewRepositoriesListController',
     ['$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil',
     function ($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -25,7 +27,7 @@ angular.module('Bastion.content-views').controller('ContentViewRepositoriesListC
             'content_view_id': $scope.$stateParams.contentViewId,
             'content_type': 'yum'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.load();

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

@@ -18,7 +18,9 @@
 angular.module('Bastion.content-views').controller('ContentViewVersionsController',
     ['$scope', 'translate', 'Nutupane', 'ContentViewVersion', 'AggregateTask', 'ApiErrorHandler', 'Notification',
     function ($scope, translate, Nutupane, ContentViewVersion, AggregateTask, ApiErrorHandler, Notification) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         function pluralSafe(count, strings) {
             if (count === 1) {
@@ -147,7 +149,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionsControlle
 
         $scope.historyText = function (version) {
             var taskTypes = $scope.taskTypes,
-                taskType = version['last_event'].task.label,
+                taskType = version['last_event'].task ? version['last_event'].task.label : taskTypes[version['last_event'].action],
                 message = "";
 
             if (taskType === taskTypes.deletion) {
@@ -224,7 +226,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionsControlle
             loading: true
         };
 
-        nutupane = new Nutupane(ContentViewVersion, {'content_view_id': $scope.$stateParams.contentViewId});
+        nutupane = new Nutupane(ContentViewVersion, {'content_view_id': $scope.$stateParams.contentViewId}, undefined, nutupaneParams);
         $scope.controllerName = 'katello_content_views';
         nutupane.setSearchKey('contentViewVersionSearch');
         nutupane.masterOnly = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js

@@ -15,8 +15,13 @@ angular.module('Bastion.content-views').controller('DateTypeErrataFilterControll
     ['$scope', 'translate', 'Rule', 'Notification', function ($scope, translate, Rule, Notification) {
 
         function convertRuleStringsToDates() {
-            $scope.rule['start_date'] = new Date($scope.rule['start_date']);
-            $scope.rule['end_date'] = new Date($scope.rule['end_date']);
+            if ($scope.rule['start_date']) {
+                $scope.rule['start_date'] = new Date($scope.rule['start_date']);
+            }
+
+            if ($scope.rule['end_date']) {
+                $scope.rule['end_date'] = new Date($scope.rule['end_date']);
+            }
         }
 
         function success() {
@@ -63,13 +68,7 @@ angular.module('Bastion.content-views').controller('DateTypeErrataFilterControll
         };
 
         $scope.save = function (rule, filter) {
-            var params;
-
-            // Remove any hours from the dates
-            rule['start_date'].setHours(0, 0, 0, 0);
-            rule['end_date'].setHours(0, 0, 0, 0);
-
-            params = {filterId: filter.id, ruleId: rule.id};
+            var params = {filterId: filter.id, ruleId: rule.id};
             rule.$update(params, success, failure);
             $scope.filter.rules[0] = rule;
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-helper.service.js

@@ -14,7 +14,7 @@ angular.module('Bastion.content-views').service('FilterHelper',
             'rpm': translate('RPM'),
             'erratum': translate('Errata'),
             'package_group': translate('Package Groups'),
-            'docker': translate('Docker Tags')
+            'docker': translate('Container Image Tags')
         };
 
         this.contentType = function (type) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js

@@ -79,7 +79,7 @@ angular.module('Bastion.content-views').controller('NewFilterController',
         } else {
             $scope.filter.type = "docker";
             $scope.filterChoices = [
-                {id: 'docker', name: translate('Docker Tag')}
+                {id: 'docker', name: translate('Container Image Tag')}
             ];
         }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/date-type-errata.html

@@ -50,7 +50,9 @@
 
 <div bst-form-group label="{{ 'Start Date' | translate }}">
   <div class="input-group">
-    <input class="form-control" uib-datepicker-popup ng-model="rule.start_date" is-open="date.startOpen" ng-click="openStartDate($event)"/>
+    <input type="date" class="form-control" uib-datepicker-popup
+           ng-model="rule.start_date" ng-model-options="{timezone: 'UTC'}"
+           is-open="date.startOpen" ng-click="openStartDate($event)"/>
     <span class="input-group-btn">
       <button class="btn btn-default" type="button" ng-click="openStartDate($event)">
         <i class="fa fa-calendar inline-icon"></i>
@@ -61,7 +63,9 @@
 
 <div bst-form-group label="{{ 'End Date' | translate }}">
   <div class="input-group">
-    <input class="form-control" uib-datepicker-popup ng-model="rule.end_date" is-open="date.endOpen" ng-click="openEndDate($event)"/>
+    <input type="date" class="form-control" uib-datepicker-popup
+           ng-model="rule.end_date" ng-model-options="{timezone: 'UTC'}"
+           is-open="date.endOpen" ng-click="openEndDate($event)"/>
     <span class="input-group-btn">
       <button class="btn btn-default" type="button" ng-click="openEndDate($event)">
         <i class="fa fa-calendar inline-icon"></i>

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

@@ -1,4 +1,4 @@
-<span page-title ng-model="filter">{{ 'Docker Tag Filter:' | translate }} {{ filter.name }}</span>
+<span page-title ng-model="filter">{{ 'Container Image Tag Filter:' | translate }} {{ filter.name }}</span>
 
 <nav>
   <ul class="nav nav-tabs nav-tabs-pf">

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

@@ -1,7 +1,7 @@
 <span page-title ng-model="contentView">{{ 'New Filter for Content View:' | translate }} {{ contentView.name }}</span>
 
 <h3 ng-show="stateIncludes('content-view.yum')" translate>Add New Yum Filter</h3>
-<h3 ng-show="stateIncludes('content-view.docker')" translate>Add New Docker Tag Filter</h3>
+<h3 ng-show="stateIncludes('content-view.docker')" translate>Add New Container Image Tag Filter</h3>
 
 <div class="row">
   <div class="col-sm-5">

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

@@ -26,8 +26,8 @@ angular.module('Bastion.content-views').controller('ContentViewHistoryController
 
         $scope.actionText = function (history) {
             var message,
-                taskType = history.task.label,
-                taskTypes = $scope.taskTypes;
+                taskTypes = $scope.taskTypes,
+                taskType = history.task ? history.task.label : taskTypes[history.action];
 
             if (taskType === taskTypes.deletion) {
                 message = translate("Deleted from %s").replace('%s', history.environment.name);

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

@@ -25,7 +25,11 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModulesCont
         $scope.versionText = function (module) {
             var version;
             if (module['computed_version']) {
-                version = translate("Latest (Currently %s)").replace('%s', module['computed_version']);
+                if (module.uuid) {
+                    version = translate("Currently %s").replace('%s', module['computed_version']);
+                } else {
+                    version = translate("Latest (Currently %s)").replace('%s', module['computed_version']);
+                }
             } else {
                 version = translate("Unable to determine version");
             }

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

@@ -61,7 +61,8 @@
 
       <li uib-dropdown
           ng-class="{active: stateIncludes('content-view.repositories.yum') || stateIncludes('content-view.yum.filters')}"
-          ng-hide="contentView.composite">
+          ng-hide="contentView.composite || !repositoryTypeEnabled('yum')">
+
         <a uib-dropdown-toggle>
           <span translate>Yum Content</span>
           <i class="fa fa-chevron-down"></i>
@@ -81,21 +82,21 @@
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.repositories.deb')}"
-          ng-hide="contentView.composite">
+          ng-hide="contentView.composite || !repositoryTypeEnabled('deb')">
         <a ui-sref="content-view.repositories.deb.list" translate>
           Apt Repositories
         </a>
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.repositories.file')}"
-          ng-hide="contentView.composite">
+          ng-hide="contentView.composite || !repositoryTypeEnabled('file')">
         <a ui-sref="content-view.repositories.file.list" translate>
           File Repositories
         </a>
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.puppet-modules')}"
-          ng-hide="contentView.composite">
+          ng-hide="contentView.composite || !repositoryTypeEnabled('puppet')">
         <a ui-sref="content-view.puppet-modules.list" translate>
           Puppet Modules
         </a>
@@ -103,9 +104,9 @@
 
       <li uib-dropdown
           ng-class="{active: stateIncludes('content-view.repositories.docker') || stateIncludes('content-view.docker.filters')}"
-          ng-hide="contentView.composite">
+          ng-hide="contentView.composite || !repositoryTypeEnabled('docker')">
         <a uib-dropdown-toggle>
-          <span translate>Docker Content</span>
+          <span translate>Container Images</span>
           <i class="fa fa-chevron-down"></i>
         </a>
         <ul uib-dropdown-menu>
@@ -123,7 +124,7 @@
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.repositories.ostree')}"
-          ng-hide="contentView.composite">
+          ng-hide="contentView.composite || !repositoryTypeEnabled('ostree')">
         <a ui-sref="content-view.repositories.ostree.list" translate>
           OSTree Content
         </a>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html

@@ -92,18 +92,18 @@
           <td bst-table-cell>
             <div>
               <span translate>
-                {{ repository.content_counts.docker_manifest }} Docker Manifests
+                {{ repository.content_counts.docker_manifest }} Container Image Manifests
               </span>
             </div>
             <div>
               <span translate>
-                {{ repository.content_counts.docker_manifest_list }} Docker Manifest Lists
+                {{ repository.content_counts.docker_manifest_list }} Container Image Manifest Lists
               </span>
             </div>
 
             <div>
               <span translate>
-                {{ repository.content_counts.docker_tag }} Docker Tags
+                {{ repository.content_counts.docker_tag }} Container Image Tags
               </span>
             </div>
           </td>

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

@@ -35,6 +35,20 @@
           With this option selected, a puppet environment will be created during publish and promote even if no puppet modules have been added to the Content View
         </p>
       </dd>
+
+      <div ng-if="contentView.composite">
+        <dt translate>Auto Publish</dt>
+        <dd>
+          <div bst-edit-checkbox="contentView.auto_publish"
+               formatter="booleanToYesNo"
+               on-save="save(contentView)"
+               readonly="denied('edit_content_views', contentView)">
+          </div>
+          <p class="help-text">
+            Applicable only for composite views. Auto publish composite view when a new version of a component content view is created. Also note auto publish will only happen when the component is marked "latest".
+          </p>
+        </dd>
+      </div>
     </dl>
   </div>
 </div>

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

@@ -66,13 +66,13 @@
               {{ version.puppet_module_count }} Puppet Modules
             </div>
             <div translate ng-if="version.docker_manifest_count && version.docker_manifest_count > 0">
-              {{ version.docker_manifest_count }} Docker Manifests
+              {{ version.docker_manifest_count }} Container Image Manifests
             </div>
             <div translate ng-if="version.docker_manifest_list_count && version.docker_manifest_list_count > 0">
-              {{ version.docker_manifest_list_count }} Docker Manifest Lists
+              {{ version.docker_manifest_list_count }} Container Image Manifest Lists
             </div>
             <div translate ng-if="version.docker_tag_count && version.docker_tag_count > 0">
-              {{ version.docker_tag_count }} Docker Tags
+              {{ version.docker_tag_count }} Container Image Tags
             </div>
             <div translate ng-if="version.ostree_branch_count && version.ostree_branch_count > 0">
               {{ version.ostree_branch_count }} OSTree Branches
@@ -99,7 +99,15 @@
                 <span class="sr-only">Toggle Dropdown</span>
               </button>
               <ul class="dropdown-menu">
-                <li><a href="#">Promote</a></li>
+                <li>
+                  <a href="#"
+                     ng-click="$state.go('content-view.promotion', {contentViewId: contentView.id, versionId: version.id})"
+                     ng-hide="denied('promote_or_remove_content_views', contentView)"
+                     ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask"
+                     translate>
+                     Promote
+                  </a>
+                </li>
                 <li>
                   <a href="#"
                      ng-click="regenerateRepositories(version)"