katello 3.0.0.rc4 → 3.0.0.rc5

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js

@@ -48,12 +48,12 @@ angular.module('Bastion.products').controller('ProductDetailsController',
             var readOnlyReason = null;
 
             if (product.$resolved) {
-                if ($scope.denied('destroy_products', product)) {
+                if (product.redhat) {
+                    readOnlyReason = 'redhat';
+                } else if ($scope.denied('destroy_products', product)) {
                     readOnlyReason = 'permissions';
                 } else if (product['published_content_view_ids'].length > 0) {
                     readOnlyReason = 'published';
-                } else if (product.redhat) {
-                    readOnlyReason = 'redhat';
                 }
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-details.html

@@ -20,17 +20,17 @@
         </div>
 
         <span ng-switch="getReadOnlyReason(product)" bst-feature-flag="custom_products">
-          <i class="fa fa-question-sign" ng-switch-when="permissions"
+          <i class="fa fa-question-circle" ng-switch-when="permissions"
              tooltip="{{ 'You cannot remove this product because you do not have permission.' | translate }}"
              tooltip-animation="false"
              tooltip-append-to-body="true">
           </i>
-          <i class="fa fa-question-sign" ng-switch-when="published"
+          <i class="fa fa-question-circle" ng-switch-when="published"
              tooltip="{{ 'You cannot remove this product because it was published to a content view.' | translate }}"
              tooltip-animation="false"
              tooltip-append-to-body="true">
           </i>
-          <i class="fa fa-question-sign" ng-switch-when="redhat"
+          <i class="fa fa-question-circle" ng-switch-when="redhat"
              tooltip="{{ 'You cannot remove this product because it is a Red Hat product.' | translate }}"
              tooltip-animation="false"
              tooltip-append-to-body="true">
@@ -38,7 +38,7 @@
         </span>
 
         <button class="btn btn-default" bst-feature-flag="custom_products"
-                ng-hide="productDeletable(product)"
+                ng-disabled="!productDeletable(product)"
                 ng-click="openModal()">
           <i class="fa fa-trash-o"></i>
           {{ "Remove Product" | translate }}

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

@@ -7,13 +7,15 @@
  * @requires GPGKey
  * @requires FormUtils
  * @requires translate
+ * @requires Setting
+ * @requires ApiErrorHandler
  *
  * @description
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', 'Repository', 'GPGKey', 'FormUtils', 'translate', 'GlobalNotification',
-    function ($scope, Repository, GPGKey, FormUtils, translate, GlobalNotification) {
+    ['$scope', 'Repository', 'GPGKey', 'FormUtils', 'translate', 'GlobalNotification', 'Setting', 'ApiErrorHandler',
+    function ($scope, Repository, GPGKey, FormUtils, translate, GlobalNotification, Setting, ApiErrorHandler) {
 
         function success(response) {
             $scope.detailsTable.rows.push(response);
@@ -48,6 +50,13 @@ 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});
 
+        Setting.get({"search": "name = default_download_policy"},
+            function (data) {
+                $scope.repository['download_policy'] = data.results[0].value;
+            }, function (data) {
+                ApiErrorHandler.handleGETRequestErrors(data, $scope);
+            });
+
         Repository.repositoryTypes({'creatable': true}, function (data) {
             $scope.repositoryTypes = data;
         });
@@ -67,6 +76,9 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             if (repository.content_type === 'ostree') {
                 repository.unprotected = false;
             }
+            if (repository.content_type !== 'yum') {
+                repository['download_policy'] = '';
+            }
             repository.$save(success, error);
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/setting.factory.js

@@ -0,0 +1,15 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.settings.factory:Setting
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for a Setting.
+ */
+angular.module('Bastion.settings').factory('Setting',
+    ['BastionResource', function (BastionResource) {
+        var resource = BastionResource('/api/v2/settings/');
+        return resource;
+    }]
+);

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

@@ -0,0 +1,12 @@
+/**
+ * @ngdoc module
+ * @name  Bastion.settings
+ *
+ * @description
+ *    Module for settings
+ */
+angular.module('Bastion.settings', [
+    'ngResource',
+    'Bastion',
+    'Bastion.common'
+]);

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

@@ -54,7 +54,7 @@
         <td bst-table-cell>{{ contentHost.service_level }}</td>
         <td bst-table-cell>{{ contentHost.facts.cpu['cpu_socket(s)'] }}</td>
         <td bst-table-cell>{{ contentHost.facts.cpu['core(s)_per_socket'] }}</td>
-        <td bst-table-cell>{{ host.facts["dmi::memory::size"]) }}</td>
+        <td bst-table-cell>{{ contentHost.facts.dmi.memory['size'] }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/new-sync-plan.controller.js

@@ -25,6 +25,7 @@ angular.module('Bastion.sync-plans').controller('NewSyncPlanController',
             function success(syncPlan) {
                 $scope.working = false;
                 GlobalNotification.setSuccessMessage(translate('New sync plan successfully created.'));
+                $scope.nutupane.refresh();
                 if ($scope.product) {
                     $scope.product['sync_plan_id'] = syncPlan.id;
                     $scope.$state.go('products.details.info', {productId: $scope.product.id});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plans.controller.js

@@ -48,6 +48,7 @@ angular.module('Bastion.sync-plans').controller('SyncPlansController',
                 syncPlan.$remove(function () {
                     GlobalNotification.setSuccessMessage(translate('Sync Plan %s has been deleted.').replace('%s', syncPlan.name));
                     $scope.removeRow(syncPlan.id);
+                    $scope.nutupane.refresh();
                     $scope.transitionTo('sync-plans.index');
                 });
             };

data/lib/katello/engine.rb

@@ -149,6 +149,11 @@ module Katello
         fail Foreman::Exception, N_("Organizations disabled, try allowing them in foreman/config/settings.yaml")
       end
 
+      # Rendering concerns needs to be injected to controllers, Foreman::Renderer was already included
+      # otherwise subscription_manager_configuration_url is not available in template preview
+      (TemplatesController.descendants + [TemplatesController]).each do |klass|
+        klass.send(:include, Katello::KatelloUrlsHelper)
+      end
       # Lib Extensions
       ::Foreman::Renderer.send :include, Katello::Concerns::RendererExtensions
 
@@ -170,7 +175,6 @@ module Katello
       ::DockerContainerWizardState.send :include, Katello::Concerns::DockerContainerWizardStateExtensions
 
       #Controller extensions
-      ::OperatingsystemsController.send :include, Katello::Concerns::OperatingsystemsControllerExtensions
       ::HostsController.send :include, Katello::Concerns::HostsControllerExtensions
       ::SmartProxiesController.send :include, Katello::Concerns::SmartProxiesControllerExtensions
       ::Containers::StepsController.send :include, Katello::Concerns::Containers::StepsControllerExtensions

data/lib/katello/tasks/clean_backend_objects.rake

@@ -58,6 +58,12 @@ namespace :katello do
       end
     end
 
+    # check services first
+    result = ::Katello::Ping.ping
+    if result[:status] != ::Katello::Ping::OK_RETURN_CODE
+      fail "Could not connect to service: #{result[:message]}"
+    end
+
     User.current = User.anonymous_admin
     cleanup_systems
     cleanup_host_delete_artifacts

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.0.0.rc4"
+  VERSION = "3.0.0.rc5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0.rc5
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -479,7 +479,6 @@ files:
 - app/controllers/katello/concerns/containers/steps_controller_extensions.rb
 - app/controllers/katello/concerns/filtered_auto_complete_search.rb
 - app/controllers/katello/concerns/hosts_controller_extensions.rb
-- app/controllers/katello/concerns/operatingsystems_controller_extensions.rb
 - app/controllers/katello/concerns/organizations_controller_extensions.rb
 - app/controllers/katello/concerns/smart_proxies_controller_extensions.rb
 - app/controllers/katello/errata_controller.rb
@@ -535,6 +534,7 @@ files:
 - app/lib/actions/candlepin/owner/auto_attach.rb
 - app/lib/actions/candlepin/owner/create.rb
 - app/lib/actions/candlepin/owner/destroy.rb
+- app/lib/actions/candlepin/owner/refresh_subscriptions.rb
 - app/lib/actions/candlepin/product/content_add.rb
 - app/lib/actions/candlepin/product/content_create.rb
 - app/lib/actions/candlepin/product/content_destroy.rb
@@ -1030,7 +1030,7 @@ files:
 - app/views/katello/api/v2/gpg_keys/index.json.rabl
 - app/views/katello/api/v2/gpg_keys/show.json.rabl
 - app/views/katello/api/v2/host_collection_errata/index.json.rabl
-- app/views/katello/api/v2/host_collections/_host_collection.json.rabl
+- app/views/katello/api/v2/host_collections/base.json.rabl
 - app/views/katello/api/v2/host_collections/copy.json.rabl
 - app/views/katello/api/v2/host_collections/create.json.rabl
 - app/views/katello/api/v2/host_collections/delta_activation_keys.rabl
@@ -1169,6 +1169,8 @@ files:
 - app/views/overrides/about/_support_documentation.html.erb
 - app/views/overrides/about/_system_status.html.erb
 - app/views/overrides/activation_keys/_host_environment_select.html.erb
+- app/views/overrides/activation_keys/_host_media_type_select.html.erb
+- app/views/overrides/activation_keys/_host_synced_content_select.html.erb
 - app/views/overrides/activation_keys/_host_tab.html.erb
 - app/views/overrides/activation_keys/_host_tab_pane.html.erb
 - app/views/overrides/hosts/_subscription_link.html.erb
@@ -1332,6 +1334,8 @@ files:
 - db/migrate/20160317171813_change_activation_key_column_names.rb
 - db/migrate/20160323065901_increase_cdn_length.rb
 - db/migrate/20160404132250_remove_katello_from_notification_name.rb
+- db/migrate/20160413230128_add_kickstart_repository_to_hosts_and_hostgroups.rb
+- db/migrate/20160426145517_move_host_description_to_host_comment.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1724,6 +1728,8 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/repositories/new/views/repository-new.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/repositories/repositories.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/repositories/repository.factory.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/setting.factory.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/settings.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-associations-activation-keys.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-associations-content-hosts.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js
@@ -1811,7 +1817,6 @@ files:
 - lib/katello/permissions/host_collections_permissions.rb
 - lib/katello/permissions/host_permissions.rb
 - lib/katello/permissions/lifecycle_environment_permissions.rb
-- lib/katello/permissions/operatingsystems_permissions.rb
 - lib/katello/permissions/organization_permissions.rb
 - lib/katello/permissions/product_permissions.rb
 - lib/katello/permissions/subscription_permissions.rb

data/app/controllers/katello/concerns/operatingsystems_controller_extensions.rb

@@ -1,34 +0,0 @@
-module Katello
-  module Concerns
-    module OperatingsystemsControllerExtensions
-      extend ActiveSupport::Concern
-
-      def available_kickstart_repo
-        host = ::Host.new
-        host.operatingsystem = Operatingsystem.find(params[:id])
-        host.architecture = Architecture.find(params[:architecture_id])
-
-        lifecycle_env = Katello::KTEnvironment.find(params[:lifecycle_environment_id])
-        content_view = Katello::ContentView.find(params[:content_view_id])
-        host.content_facet = Host::ContentFacet.new(:lifecycle_environment_id => lifecycle_env.id,
-                                                    :content_view_id => content_view.id)
-        host.content_source = SmartProxy.find(params[:content_source_id])
-
-        if  host.operatingsystem.is_a?(Redhat)
-          render :json =>  host.operatingsystem.kickstart_repo(host)
-        else
-          render :json => nil
-        end
-      end
-
-      def action_permission
-        case params[:action]
-        when 'available_kickstart_repo'
-          'view'
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/katello/permissions/operatingsystems_permissions.rb

@@ -1,5 +0,0 @@
-require 'katello/plugin.rb'
-
-Foreman::AccessControl.permission(:view_operatingsystems).actions.concat [
-  'operatingsystems/available_kickstart_repo'
-]