katello 3.0.0.rc5 → 3.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187b57f332a5874b4a314c94c1b3e12f2b2fd66d
-  data.tar.gz: 64c23ed8c7a6f578f491c6eb5386f81159f72c04
+  metadata.gz: 636bd960fc851d7cfc7cad566463d5f9d12ecd31
+  data.tar.gz: 6e0d3f04c2ea64cc9e4d587b634e901328023f99
 SHA512:
-  metadata.gz: e8bacef15a3899b32653906402c585a048b00bd76e3a294f91d906dc0d9b63db5f730ecdb6eca690f0f218e67a99e2069bc7699f764dddff08faefdd5ec994c2
-  data.tar.gz: a7c7121087bc8207fb8ccf73c01fcf77ea17b1442b88717919e891381beb0e88dd608f37404b6aa69bf607e313a2f62579d6b035d8da0be8ebdcb7c19929c293
+  metadata.gz: d95efc1f9e60ae63131a696dc04cc59887f84c59b0da8cca8682af6d94b560267f5b6f2e0a11c66dd249be71438dc88f3de65f0d3b720730db10042e63403cfb
+  data.tar.gz: 7f797259505a86902c5335fed36f1affb78e84f75bcbc0f35709887f6907067c555e17312e75883269a101bfd6cf32e93efc6255a6a87499b5b19f0f2ce0a8c4

data/app/controllers/katello/api/v2/api_controller.rb

@@ -57,8 +57,9 @@ module Katello
       sort_attr = params[:sort_by] || default_sort_by
 
       if sort_attr
-        sort_attr = "#{query.table_name}.#{sort_attr}" unless sort_attr.to_s.include?('.')
-        query = query.order("#{sort_attr} #{params[:sort_order] || default_sort_order}")
+        sort_order = (params[:sort_order] || default_sort_order).to_s.downcase
+        sort_order = default_sort_order unless ['desc', 'asc'].include?(sort_order)
+        query = query.order(sort_attr => sort_order.to_sym)
       elsif options[:custom_sort]
         query = options[:custom_sort].call(query)
       end

data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb

@@ -113,8 +113,11 @@ module Katello
 
     def process_errata_ids(select_all_params)
       if select_all_params[:included][:ids].blank?
+        select_all_params[:excluded][:ids] ||= [] if select_all_params[:excluded][:ids].nil?
         current_errata_ids = @filter.erratum_rules.map(&:errata_id) + select_all_params[:excluded][:ids]
-        Erratum.where('errata_id not in (?)', current_errata_ids).in_repositories(@filter.applicable_repos).pluck(:errata_id)
+        query = Erratum
+        query = query.where('errata_id not in (?)', current_errata_ids) unless current_errata_ids.empty?
+        query.in_repositories(@filter.applicable_repos).pluck(:errata_id)
       else
         []
       end

data/app/controllers/katello/api/v2/content_view_versions_controller.rb

@@ -20,9 +20,11 @@ module Katello
     param :composite_version_id, :identifier, :desc => N_("Filter versions that are components in the specified composite version"), :required => false
     param_group :search, Api::V2::ApiController
     def index
-      includes = [:content_view, :environments, :composite_content_views, :history => :task]
-      sort = "#{ContentViewVersion.table_name}.major desc, #{ContentViewVersion.table_name}.minor desc"
-      respond(:collection => scoped_search(index_relation.uniq, sort, '', :includes => includes))
+      options = {
+        :includes => [:content_view, :environments, :composite_content_views, :history => :task],
+        :custom_sort => lambda { |query| query.order("#{ContentViewVersion.table_name}.major desc, #{ContentViewVersion.table_name}.minor desc") }
+      }
+      respond(:collection => scoped_search(index_relation.uniq, nil, nil, options))
     end
 
     def index_relation

data/app/controllers/katello/api/v2/host_packages_controller.rb

@@ -91,8 +91,9 @@ module Katello
     def find_editable_host_with_facet
       @host = resource_finder(::Host::Managed.authorized("edit_hosts"), params[:host_id])
       fail HttpErrors::NotFound, _("Couldn't find host with host id '%s'") % params[:host_id] if @host.nil?
-      fail HttpErrors::NotFound, _("Host id '%s' does not have a content facet") % params[:host_id] if @host.content_facet.nil?
-      fail HttpErrors::NotFound, _("Host id '%s' content facet is missing a uuid") % params[:host_id] if @host.content_facet.uuid.nil?
+      if @host.content_facet.try(:uuid).nil?
+        fail HttpErrors::NotFound, _("Host has not been registered with subscription-manager.") % params[:host_id]
+      end
       @host
     end
 

data/app/lib/actions/katello/host/destroy.rb

@@ -33,6 +33,7 @@ module Actions
 
             host.get_status(::Katello::ErrataStatus).destroy
             host.get_status(::Katello::SubscriptionStatus).destroy
+            host.installed_packages.destroy_all
           else
             host.content_facet.try(:destroy!)
             unless host.destroy

data/app/lib/actions/katello/repository/destroy.rb

@@ -22,15 +22,16 @@ module Actions
 
           plan_action(ContentViewPuppetModule::Destroy, repository) if repository.puppet?
           plan_action(Pulp::Repository::Destroy, pulp_id: repository.pulp_id)
-          plan_action(Product::ContentDestroy, repository)
-          plan_action(Repository::DestroyMedium, repository)
+          sequence do
+            plan_action(Product::ContentDestroy, repository)
+            plan_action(Repository::DestroyMedium, repository)
 
-          view_env = repository.content_view.content_view_environment(repository.environment)
+            view_env = repository.content_view.content_view_environment(repository.environment)
+            repository.destroy! if planned_destroy
 
-          repository.destroy! if planned_destroy
-
-          if !skip_environment_update && ::SETTINGS[:katello][:use_cp] && view_env
-            plan_action(ContentView::UpdateEnvironment, repository.content_view, repository.environment)
+            if !skip_environment_update && ::SETTINGS[:katello][:use_cp] && view_env
+              plan_action(ContentView::UpdateEnvironment, repository.content_view, repository.environment)
+            end
           end
 
           plan_self(:user_id => ::User.current.id, :planned_destroy => planned_destroy)

data/app/lib/actions/pulp/repository/presenters/{iso_presenter.rb → file_presenter.rb}

@@ -2,7 +2,7 @@ module Actions
   module Pulp
     module Repository
       module Presenters
-        class IsoPresenter < AbstractSyncPresenter
+        class FilePresenter < AbstractSyncPresenter
           def progress
             total_bytes == 0 ? 0.01 : finished_bytes.to_f / total_bytes
           end
@@ -12,7 +12,7 @@ module Actions
           def humanized_details
             ret = []
             ret << _("Cancelled.") if cancelled?
-            ret << _("New ISOs: %s") % num_isos
+            ret << _("New Files: %s") % num_isos
             ret.join("\n")
           end
 

data/app/lib/actions/pulp/repository/sync.rb

@@ -86,7 +86,7 @@ module Actions
           elsif repo.try(:yum?)
             Presenters::YumPresenter.new(self)
           elsif repo.try(:file?)
-            Presenters::IsoPresenter.new(self)
+            Presenters::FilePresenter.new(self)
           elsif repo.try(:docker?)
             Presenters::DockerPresenter.new(self)
           elsif repo.try(:ostree?)

data/app/lib/katello/bulk_actions.rb

@@ -7,14 +7,14 @@ module Katello
     end
 
     def install_packages(packages)
-      fail Errors::HostCollectionEmptyException if self.consumer_ids.empty?
+      fail Errors::EmptyBulkActionException if self.consumer_ids.empty?
       perform_bulk_action do |consumer_group|
         consumer_group.install_package(packages)
       end
     end
 
     def uninstall_packages(packages)
-      fail Errors::HostCollectionEmptyException if self.consumer_ids.empty?
+      fail Errors::EmptyBulkActionException if self.consumer_ids.empty?
       perform_bulk_action do |consumer_group|
         consumer_group.uninstall_package(packages)
       end
@@ -22,28 +22,28 @@ module Katello
 
     def update_packages(packages = nil)
       # if no packages are provided, a full system update will be performed (e.g ''yum update' equivalent)
-      fail Errors::HostCollectionEmptyException if self.consumer_ids.empty?
+      fail Errors::EmptyBulkActionException if self.consumer_ids.empty?
       perform_bulk_action do |consumer_group|
         consumer_group.update_package(packages)
       end
     end
 
     def install_package_groups(groups)
-      fail Errors::HostCollectionEmptyException if self.consumer_ids.empty?
+      fail Errors::EmptyBulkActionException if self.consumer_ids.empty?
       perform_bulk_action do |consumer_group|
         consumer_group.install_package_group(groups)
       end
     end
 
     def update_package_groups(groups)
-      fail Errors::HostCollectionEmptyException if self.consumer_ids.empty?
+      fail Errors::EmptyBulkActionException if self.consumer_ids.empty?
       perform_bulk_action do |consumer_group|
         consumer_group.install_package_group(groups)
       end
     end
 
     def uninstall_package_groups(groups)
-      fail Errors::HostCollectionEmptyException if self.consumer_ids.empty?
+      fail Errors::EmptyBulkActionException if self.consumer_ids.empty?
       perform_bulk_action do |consumer_group|
         consumer_group.uninstall_package_group(groups)
       end

data/app/lib/katello/concerns/renderer_extensions.rb

@@ -10,7 +10,8 @@ module Katello
       def kickstart_attributes_with_katello
         kickstart_attributes_without_katello
 
-        if @host.content_facet.try(:content_view) && @host.operatingsystem.is_a?(Redhat) &&
+        content_view = @host.try(:content_facet).try(:content_view) || @host.try(:content_view)
+        if content_view && @host.operatingsystem.is_a?(Redhat) &&
                 @host.operatingsystem.kickstart_repos(@host).first.present?
           @mediapath ||= @host.operatingsystem.mediumpath(@host)
         end

data/app/lib/katello/errors.rb

@@ -35,6 +35,12 @@ module Katello
       end
     end
 
+    class EmptyBulkActionException < StandardError
+      def message
+        _("No hosts registered with subscription-manager found in selection.")
+      end
+    end
+
     class ConnectionRefusedException < StandardError; end
 
     class MaxHostsReachedException < StandardError; end

data/app/models/katello/concerns/operatingsystem_extensions.rb

@@ -40,6 +40,14 @@ module Katello
         self.architectures << Architecture.where(:name => "x86_64").first_or_create
         self.family = "Redhat"
       end
+
+      def atomic?
+        name.match(/.*atomic.*/i)
+      end
     end
   end
 end
+
+class ::Operatingsystem::Jail < Safemode::Jail
+  allow :atomic?
+end

data/app/models/katello/concerns/redhat_extensions.rb

@@ -44,8 +44,10 @@ module Katello
       end
 
       def medium_uri_with_content_uri(host, url = nil)
-        if host.try(:content_source) && host.content_facet.try(:kickstart_repository).present?
-          return URI.parse(host.content_facet.kickstart_repository.full_path(host.content_source))
+        kickstart_repo = host.try(:content_facet).try(:kickstart_repository) || host.try(:kickstart_repository)
+
+        if host.try(:content_source) && kickstart_repo.present?
+          return URI.parse(kickstart_repo.full_path(host.content_source))
         else
           medium_uri_without_content_uri(host, url)
         end
@@ -63,8 +65,8 @@ module Katello
       end
 
       def distribution_repositories(host)
-        content_view = host.content_facet.try(:content_view)
-        lifecycle_environment = host.content_facet.try(:lifecycle_environment)
+        content_view = host.try(:content_facet).try(:content_view) || host.try(:content_view)
+        lifecycle_environment = host.try(:content_facet).try(:lifecycle_environment) || host.try(:lifecycle_environment)
 
         if content_view && lifecycle_environment
           Katello::Repository.in_environment(lifecycle_environment).in_content_views([content_view]).

data/app/models/katello/glue/pulp/repo.rb

@@ -159,7 +159,7 @@ module Katello
 
       def importer_feed_url(capsule = false)
         if capsule
-          self.full_path
+          self.full_path(nil, true)
         else
           self.url
         end
@@ -827,9 +827,9 @@ module Katello
       end
     end
 
-    def full_path(smart_proxy = nil)
+    def full_path(smart_proxy = nil, force_https = false)
       pulp_uri = URI.parse(smart_proxy ? smart_proxy.url : SETTINGS[:katello][:pulp][:url])
-      scheme   = (self.unprotected ? 'http' : 'https')
+      scheme   = (self.unprotected && !force_https) ? 'http' : 'https'
       if docker?
         "#{pulp_uri.host.downcase}:5000/#{pulp_id}"
       elsif file?

data/app/views/foreman/unattended/snippets/_subscription_manager_registration.erb

@@ -1,6 +1,6 @@
 <% if @host.params['kt_activation_keys'] %>
   # add subscription manager
- <% if @host.operatingsystem.name.match(/.*atomic.*/i) %>
+ <% if @host.operatingsystem.atomic? %>
   curl -s <%= subscription_manager_configuration_url(@host, false) %> | IS_ATOMIC=true bash
  <% else %>
   yum -t -y -e 0 install subscription-manager
@@ -10,7 +10,7 @@
   echo "Registering the System"
   subscription-manager register --org="<%= @host.rhsm_organization_label %>" --name="<%= @host.name %>" --activationkey="<%= @host.params['kt_activation_keys'] %>"
 
-  <% unless @host.operatingsystem.name.match(/.*atomic.*/i) %>
+  <% unless @host.operatingsystem.atomic? %>
     echo "Installing Katello Agent"
     yum -t -y -e 0 install katello-agent
     chkconfig goferd on

data/app/views/foreman/unattended/userdata-katello.erb

@@ -6,11 +6,28 @@ oses:
 - CentOS 7
 - Fedora 19
 - Fedora 20
+- Fedora 21
+- Fedora 22
+- Fedora 23
 -%>
 #cloud-config
 hostname: <%= @host.shortname %>
 fqdn: <%= @host %>
 manage_etc_hosts: true
+
+groups:
+ - admin
+
+users:
+ - default
+ - name: admin
+   primary-group: admin
+   groups: users
+   shell: /bin/bash
+   sudo: ['ALL=(ALL) ALL']
+   lock-passwd: false
+   passwd: <%= @host.root_pass %>
+
 <%# Allow user to specify additional SSH key as host paramter -%>
 <% if @host.params['sshkey'].present? || @host.params['remote_execution_ssh_keys'].present? -%>
 ssh_authorized_keys:
@@ -34,13 +51,16 @@ write_files:
       snippet 'freeipa_register'
     end %>
 <% end -%>
+  <% unless @host.operatingsystem.atomic? -%>
     # update all the base packages from the updates repository
     yum -t -y -e 0 update
+  <% end -%>
 <%
   # safemode renderer does not support unary negation
+  non_atomic = @host.operatingsystem.atomic? ? false : true
   pm_set = @host.puppetmaster.empty? ? false : true
-  puppet_enabled = pm_set || @host.params['force-puppet']
-  salt_enabled = @host.params['salt_master'] ? true : false
+  puppet_enabled = non_atomic && (pm_set || @host.params['force-puppet'])
+  salt_enabled = non_atomic && (@host.params['salt_master'] ? true : false)
 %>
 <% if salt_enabled %>
     yum -t -y -e 0 install salt-minion

data/app/views/overrides/activation_keys/_host_tab.html.erb

@@ -1,3 +1,3 @@
-<li id="activation_keys_tab">
+<li>
   <a href="#activation_keys" data-toggle="tab"><%= _('Activation Keys') %></a>
 </li>

data/app/views/smart_proxies/plugins/_pulp.html.erb

@@ -1,6 +1,8 @@
 <div class="row">
   <h3><%= _('Pulp') %></h3>
-  <%= render :partial => 'smart_proxies/plugins/plugin_version', :locals => {:feature => feature, :proxy => @smart_proxy} %>
+</div>
+<%= show_feature_version('pulp') %>
+<div class="row">
   <div class="pulp_status" data-ajax-url="<%= pulp_status_smart_proxy_path(@smart_proxy) %>">
     <%= spinner %>
   </div>

data/app/views/smart_proxies/plugins/_pulp_node.html.erb

@@ -1,6 +1,8 @@
 <div class="row">
   <h3><%= _('Pulp node') %></h3>
-  <%= render :partial => 'smart_proxies/plugins/plugin_version', :locals => {:feature => feature.delete('_'), :proxy => @smart_proxy} %>
+</div>
+<%= show_feature_version('pulpnode') %>
+<div class="row">
   <div class="pulp_status" data-ajax-url="<%= pulp_status_smart_proxy_path(@smart_proxy) %>">
     <%= spinner %>
   </div>

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -15,6 +15,12 @@ class MigrateContentHosts < ActiveRecord::Migration
              :dependent => :restrict_with_exception, :inverse_of => :organization
   end
 
+  class SmartProxy < ActiveRecord::Base
+    self.table_name = "smart_proxies"
+
+    belongs_to :content_host, :class_name => "MigrateContentHosts::ContentHost", :inverse_of => :capsule
+  end
+
   class KTEnvironment < ActiveRecord::Base
     self.table_name = "katello_environments"
 
@@ -120,11 +126,14 @@ class MigrateContentHosts < ActiveRecord::Migration
 
     has_many :system_activation_keys, :class_name => "MigrateContentHosts::SystemActivationKey", :dependent => :destroy
     has_many :activation_keys, :through => :system_activation_keys
-    has_many :host_collections, :class_name => "MigrateContentHosts::SystemHostCollections", :dependent => :destroy
+    has_many :system_host_collections, :class_name => "MigrateContentHosts::SystemHostCollections", :dependent => :destroy
+    has_many :host_collections, :through => :system_host_collections
     has_many :applicable_errata, :through => :system_errata, :class_name => "MigrateContentHosts::Erratum", :source => :erratum
     has_many :system_errata, :class_name => "MigrateContentHosts::SystemErratum", :dependent => :destroy, :inverse_of => :system
     has_many :bound_repositories, :through => :system_repositories, :class_name => "MigrateContentHosts::Repository", :source => :repository
     has_many :system_repositories, :class_name => "MigrateContentHosts::SystemRepository", :dependent => :destroy, :inverse_of => :system
+
+    has_one :capsule, :class_name => "MigrateContentHosts::SmartProxy", :inverse_of => :content_host, :foreign_key => :content_host_id, :dependent => :nullify
   end
 
   class ContentFacet < ActiveRecord::Base
@@ -135,7 +144,7 @@ class MigrateContentHosts < ActiveRecord::Migration
     belongs_to :lifecycle_environment, :inverse_of => :content_facets, :class_name => "MigrateContentHosts::KTEnvironment"
 
     has_many :content_facet_repositories, :class_name => "MigrateContentHosts::ContentFacetRepository", :dependent => :destroy, :inverse_of => :content_facets
-    has_many :bound_repositories, :through => :content_facet_repositories, :class_name => "MigrateContentHosts::Repository", :source => :content_facets
+    has_many :bound_repositories, :through => :content_facet_repositories, :class_name => "MigrateContentHosts::Repository", :source => :repository
     has_many :applicable_errata, :through => :content_facet_errata, :class_name => "MigrateContentHosts::Erratum", :source => :erratum
     has_many :content_facet_errata, :class_name => "MigrateContentHosts::ContentFacetErratum", :dependent => :destroy, :inverse_of => :content_facet
   end
@@ -209,7 +218,7 @@ class MigrateContentHosts < ActiveRecord::Migration
     systems_to_remove.each do |system|
       logger.info("Content Host #{system.uuid} doesn't have candlepin information, unregistering.")
       if (system_proxy = SmartProxy.find_by_content_host_id(system.id))
-        system_proxy.content_host = nil
+        system_proxy.content_host_id = nil
         system_proxy.save
       end
       systems.delete(system)
@@ -284,6 +293,7 @@ class MigrateContentHosts < ActiveRecord::Migration
   end
 
   # rubocop:disable MethodLength
+  # rubocop:disable AbcSize
   def up
     if User.where(:login => User::ANONYMOUS_API_ADMIN).first.nil?
       logger.warn("Foreman anonymous admin does not exist, skipping content host migration.")
@@ -325,7 +335,11 @@ class MigrateContentHosts < ActiveRecord::Migration
         create_subscription_facet(host, system)
 
       elsif hosts.where(:organization_id => system.environment.organization.id).empty? # host is not in the correct org
-        logger.warn("Found host with hostname #{hostname} but it's in org #{hosts[0].org.name} instead of #{system.environment.organization.name}.")
+        if hosts[0].organization
+          logger.warn("Found host with hostname #{hostname} but it's in org #{hosts[0].organization.name} instead of #{system.environment.organization.name}.")
+        else
+          logger.warn("Found host with hostname #{hostname} but it is not in an org, and should be in #{system.environment.organization.name}.")
+        end
         host = hosts.first
 
         create_content_facet(host, system) unless host.content_facet

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js

@@ -20,7 +20,6 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
         var urlMatcher = $urlMatcherFactory.compile("/smart_proxies/:capsuleId");
         var capsuleId = urlMatcher.exec($location.path()).capsuleId;
 
-
         function processError(response) {
             if (response.data && response.data.displayMessage) {
                 $scope.syncErrorMessages = [response.data.displayMessage];

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.routes.js

@@ -1,15 +1,15 @@
 /**
- * @ngdoc object
- * @name Bastion.capsule-content.config
- *
- * @requires $stateProvider
- *
- * @description
- *   Used for systems level configuration such as setting up the ui state machine.
- */
+* @ngdoc object
+* @name Bastion.capsule-content.config
+*
+* @requires $stateProvider
+* @requires $urlRouterProvider
+*
+* @description
+*   Used for systems level configuration such as setting up the ui state machine.
+*/
 angular.module('Bastion.capsule-content').config(['$stateProvider', '$urlRouterProvider', function ($stateProvider, $urlRouterProvider) {
-
-    // Catch the url to prevent the router to perform redirect.
+    //Catch the url to prevent the router to perform redirect.
     $urlRouterProvider.when('/smart_proxies/:proxyId', ['$match', '$stateParams', function ($match, $stateParams) {
         $stateParams.pageName = 'smart_proxies/detail';
         return true;
@@ -25,5 +25,26 @@ angular.module('Bastion.capsule-content').config(['$stateProvider', '$urlRouterP
             $window.location.href = $location.path();
         }
     });
+}]);
 
+/**
+ * @ngdoc run
+ * @name Bastion.capsule-content.run
+ *
+ * @requires $rootScope
+ * @requires $window
+ * @requires $timeout
+ *
+ * @description
+ *   Ensure foreman's setTab() function is called on capsule content pages.
+ */
+angular.module('Bastion.capsule-content').run(['$rootScope', '$window', '$timeout', function ($rootScope, $window, $timeout) {
+    var smartProxiesRegex = new RegExp("/smart_proxies/.+#.+");
+    $rootScope.$on('$locationChangeStart', function (event, newUrl) {
+        if (newUrl.match(smartProxiesRegex)) {
+            $timeout(function () {
+                $window.setTab();
+            });
+        }
+    });
 }]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages.html

@@ -1,7 +1,6 @@
 <span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
   <h4 translate>Package Actions</h4>
   <p bst-alert="info" ng-hide="contentHost.katello_agent_installed">
     <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html

@@ -53,7 +53,7 @@
           <td bst-table-cell colspan="8"></td>
         </tr>
         <tr bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
-          <td bst-table-cell>{{ subscription | subscriptionAttachAmountFilter}}</td>
+          <td bst-table-cell>{{ subscription.quantity_consumed }}</td>
           <td bst-table-cell>
             <a ui-sref="subscriptions.details.info({subscriptionId: subscription.subscription_id})">
               {{ subscription | subscriptionConsumedFilter }}

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

@@ -16,7 +16,14 @@
 angular.module('Bastion.content-views').controller('ContentViewDetailsController',
     ['$scope', 'ContentView', 'ContentViewVersion', 'Nutupane', 'AggregateTask', 'translate', 'ApiErrorHandler',
     function ($scope, ContentView, ContentViewVersion, Nutupane, AggregateTask, translate, ApiErrorHandler) {
+        var nutupane, contentViewId = $scope.$stateParams.contentViewId;
 
+        if ($scope.contentView) {
+            contentViewId = $scope.contentView.id;
+        }
+
+        nutupane = new Nutupane(ContentViewVersion, {'content_view_id': contentViewId});
+        nutupane.masterOnly = true;
 
         function saveSuccess() {
             $scope.successMessages = [translate('Content View updated.')];
@@ -60,15 +67,21 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
         function taskUpdated(version, task) {
             var taskTypes = $scope.taskTypes;
 
-            if (!task.pending && task.result === 'success') {
-                if (task.label === taskTypes.promotion) {
-                    $scope.successMessages.push(promotionMessage(version, task));
-                } else if (task.label === taskTypes.publish) {
-                    $scope.successMessages.push(publishMessage(version));
-                } else if (task.label === taskTypes.deletion) {
-                    $scope.successMessages.push(deletionMessage(version, task));
-                    $scope.reloadVersions();
+            if (!task.pending) {
+                $scope.pendingVersionTask = false;
+
+                if (task.result === 'success') {
+                    if (task.label === taskTypes.promotion) {
+                        $scope.successMessages.push(promotionMessage(version, task));
+                    } else if (task.label === taskTypes.publish) {
+                        $scope.successMessages.push(publishMessage(version));
+                    } else if (task.label === taskTypes.deletion) {
+                        $scope.successMessages.push(deletionMessage(version, task));
+                        $scope.reloadVersions();
+                    }
                 }
+            } else {
+                $scope.pendingVersionTask = true;
             }
         }
 
@@ -101,6 +114,10 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
 
         $scope.successMessages = [];
         $scope.errorMessages = [];
+
+        $scope.detailsTable = nutupane.table;
+        $scope.pendingVersionTask = false;
+
         $scope.panel = {
             error: false,
             loading: true
@@ -132,14 +149,8 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
         };
 
         $scope.reloadVersions = function () {
-            var contentViewId = $scope.contentView.id || $scope.$stateParams.contentViewId,
-                nutupane = new Nutupane(ContentViewVersion, {
-                    'content_view_id': contentViewId
-                });
-
-            nutupane.masterOnly = true;
-
-            $scope.detailsTable = nutupane.table;
+            $scope.detailsTable.rows = [];
+            nutupane.refresh();
         };
 
         $scope.$watch('detailsTable.rows', function () {

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

@@ -1,5 +1,6 @@
 <form name="errataForm" class="form-horizontal">
 
+  <div data-block="messages" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
   <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
 
   <div bst-form-buttons

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

@@ -1,5 +1,3 @@
-<div data-block="messages" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
 <div bst-form-group label="{{ 'Errata Type' | translate }}">
 
   <label class="checkbox-inline">

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

@@ -7,6 +7,7 @@
 <div data-extend-template="layouts/details-nutupane.html">
 
   <div data-block="header"></div>
+  <span data-block="no-rows-message" translate>No Errata to display</span>
 
   <div data-block="actions">
     <button class="btn btn-primary fr"

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

@@ -3,6 +3,10 @@
 <section class="nutupane-details" ng-cloak bst-container-scroll>
   <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
+  <div bst-alert="info" ng-show="pendingVersionTask">
+   <span translate>Many Content View actions are disabled while a version task is in progress.</span>
+  </div>
+
   <div ng-hide="panel.error">
     <header class="details-header row">
       <h2 class="col-sm-6" ng-hide="contentView.composite">{{ contentView.name }}</h2>
@@ -10,20 +14,23 @@
 
       <div class="col-sm-6">
         <div class="fr">
-          <a class="btn btn-primary" ui-sref="content-views.details.publish"
+          <button class="btn btn-primary" ng-click="$state.go('content-views.details.publish')"
+             ng-disabled="pendingVersionTask"
              ng-hide="denied('publish_content_views', contentView)">
             <i class="fa fa-paste"></i>
             <span translate>Publish New Version</span>
-          </a>
+          </button>
 
-          <a class="btn btn-default"
+          <button class="btn btn-default"
+             ng-disabled="pendingVersionTask"
              ng-hide="denied('create_content_views')"
              ng-click="showCopy = true">
             <i class="fa fa-copy"></i>
             <span translate>Copy View</span>
-          </a>
+          </button>
 
-          <button class="btn btn-default" ui-sref="content-views.details.deletion"
+          <button class="btn btn-default" ng-click="$state.go('content-views.details.deletion')"
+                  ng-disabled="pendingVersionTask"
                   ng-hide="denied('destroy_content_views', contentView)">
             <i class="fa fa-trash-o"></i>
             {{ "Remove View" | translate }}

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

@@ -73,18 +73,18 @@
         </td>
         <td class="col-sm-2">
           <button class="btn btn-default"
-            ui-sref="content-views.details.promotion({contentViewId: contentView.id, versionId: version.id})"
+            ng-click="$state.go('content-views.details.promotion', {contentViewId: contentView.id, versionId: version.id})"
             ng-hide="denied('promote_or_remove_content_views', contentView)"
-            ng-disabled="taskInProgress(version) || taskFailed(version)">
+            ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
             <i class="fa fa-share-alt"></i>
             <span translate>
               Promote
             </span>
           </button>
           <button class="btn btn-default"
-            ui-sref="content-views.details.version-deletion.environments({contentViewId: contentView.id, versionId: version.id})"
+            ng-click="$state.go('content-views.details.version-deletion.environments', {contentViewId: contentView.id, versionId: version.id})"
             ng-hide="denied('promote_or_remove_content_views', contentView)"
-            ng-disabled="taskInProgress(version) || taskFailed(version)">
+            ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
             <i class="fa fa-trash-o"></i>
             <span translate>
               Remove

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/fenced-pages.service.js

@@ -18,7 +18,8 @@ angular.module('Bastion.organizations').service('FencedPages',
             'content-views',
             'errata',
             'content-hosts',
-            'host-collections'
+            'host-collections',
+            'puppet-modules'
         ];
 
         this.addPages = function (pages) {

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc5
+  version: 3.0.0.rc7
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -709,7 +709,7 @@ files:
 - app/lib/actions/pulp/repository/import_upload.rb
 - app/lib/actions/pulp/repository/presenters/abstract_sync_presenter.rb
 - app/lib/actions/pulp/repository/presenters/docker_presenter.rb
-- app/lib/actions/pulp/repository/presenters/iso_presenter.rb
+- app/lib/actions/pulp/repository/presenters/file_presenter.rb
 - app/lib/actions/pulp/repository/presenters/ostree_presenter.rb
 - app/lib/actions/pulp/repository/presenters/puppet_presenter.rb
 - app/lib/actions/pulp/repository/presenters/yum_presenter.rb