katello 3.4.0.2 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d557071b61f046420cf06747c4efd13d0702ae3
-  data.tar.gz: fa24cacf3873c9bd36814ff44b1dd9a8d99ccd76
+  metadata.gz: a69d7fd688dc60f6918570d9a46f180c5837b95b
+  data.tar.gz: f59ba04326eeec8fbb1582ff99b6b118ae04de3d
 SHA512:
-  metadata.gz: 2dafe3130a294d08dd05f4996b91a3451fbf1217b0a9e063410119c21e26c7a09c0b1572f6ae6030d3228f45e48aa02e0a1a2bc3dcb8bee2689262a98e1cfdc4
-  data.tar.gz: 5a7753c722ad029191c9d7a3b46c1f59d3b5587b84d6ef6391478973f9eca151c5965742777f8d4209d52a38ff6806bd695cc368a0c0abeac5fe6686fead9375
+  metadata.gz: 1ba9d1e9c4b60b6cbb207bfcf911c21b08fa705e661ce855104cf23d5bacaf843dc7a685cabc179f1f3cd8fbc80140147c551f499f097970de7e1f9a360b7822
+  data.tar.gz: 299af24880144ecdc9b3fd6215fb26170e3f08c94aa17150721289ecd4807c5b724244342b7f7cb2865e5652f7d8d641d05df1b5f6d2a71de6b4d3f852f412fd

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -3,6 +3,8 @@ KT.hosts = {};
 
 $(document).on('ContentLoad', function(){
     KT.hosts.onKatelloHostEditLoad();
+    window.tfm.hosts.registerPluginAttributes("os",
+         ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'content_source_id', 'architecture_id']);
 
     $("#hostgroup_lifecycle_environment_id").change(KT.hosts.fetchContentViews);
     $("#host_lifecycle_environment_id").change(KT.hosts.fetchContentViews);
@@ -248,30 +250,3 @@ KT.hosts.set_media_selection_bindings = function() {
   KT.hosts.set_synced_content_bindings();
   KT.hosts.get_media_selector_elements().change(KT.hosts.media_selection_changed);
 };
-
-// Note we are overriding the os_selected method in foreman
-// Hopefully when this gets resolved http://projects.theforeman.org/issues/14699
-// This method will get backed out.
-function os_selected(element){
-    var url = $(element).attr('data-url');
-    var type = $(element).attr('data-type');
-    var attrs = {};
-    attrs[type] = attribute_hash(['operatingsystem_id', 'organization_id', 'location_id', 'content_view_id',
-                                  'lifecycle_environment_id', 'content_source_id', 'architecture_id', 'hostgroup_id',
-                                  'medium_id', 'kickstart_repository_id']);
-  tfm.tools.showSpinner();
-  $.ajax({
-    data: attrs,
-    type:'post',
-    url: url,
-    complete: function(){
-      reloadOnAjaxComplete(element);
-    },
-    success: function(request) {
-      $('#media_select').html(request);
-        reload_host_params();
-        reload_puppetclass_params();
-    }
-  });
-  update_provisioning_image();
-};

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -114,8 +114,7 @@ module Katello
     # Note that this request comes in as content-type 'text/plain' so that
     # tomcat won't parse the json.  Here we just pass the plain body through to candlepin
     def async_hypervisors_update
-      raw_json = request.body.string
-      task = Katello::Resources::Candlepin::Consumer.async_hypervisors(params[:owner], raw_json)
+      task = Katello::Resources::Candlepin::Consumer.async_hypervisors(params[:owner], request.raw_post)
       async_task(::Actions::Katello::Host::Hypervisors, nil, :task_id => task['id'])
 
       render :json => task
@@ -137,7 +136,7 @@ module Katello
     #param :date, String, :desc => N_("check-in time")
     def consumer_checkin
       @host.update_attributes(:last_checkin => params[:date])
-      Candlepin::Consumer.new(@host.subscription_facet.uuid).checkin(params[:date])
+      Candlepin::Consumer.new(@host.subscription_facet.uuid, @host.organization.label).checkin(params[:date])
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
 
@@ -165,7 +164,7 @@ module Katello
     #desc 'Schedules the consumer identity certificate regeneration'
     def regenerate_identity_certificates
       uuid = @host.subscription_facet.uuid
-      Candlepin::Consumer.new(uuid).regenerate_identity_certificates
+      Candlepin::Consumer.new(uuid, @host.organization.label).regenerate_identity_certificates
       render :json => Resources::Candlepin::Consumer.get(uuid)
     end
 

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

@@ -131,8 +131,12 @@ module Katello
 
     api :GET, "/activation_keys/:id/product_content", N_("Show content available for an activation key")
     param :id, String, :desc => N_("ID of the activation key"), :required => true
+    param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
+    param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the activation key's content view version")
     def product_content
-      content = @activation_key.available_content
+      content_access_mode_all = ::Foreman::Cast.to_bool(params[:content_access_mode_all])
+      content_access_mode_env = ::Foreman::Cast.to_bool(params[:content_access_mode_env])
+      content = @activation_key.available_content(content_access_mode_all, content_access_mode_env)
       response = {
         :results => content,
         :total => content.size,

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

@@ -167,8 +167,12 @@ module Katello
 
     api :GET, "/hosts/:host_id/subscriptions/product_content", N_("Get content and overrides for the host")
     param :host_id, String, :desc => N_("Id of the host"), :required => true
+    param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
+    param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the host's content view version")
     def product_content
-      content = @host.subscription_facet.candlepin_consumer.available_product_content
+      content_access_mode_all = ::Foreman::Cast.to_bool(params[:content_access_mode_all])
+      content_access_mode_env = ::Foreman::Cast.to_bool(params[:content_access_mode_env])
+      content = @host.subscription_facet.candlepin_consumer.available_product_content(content_access_mode_all, content_access_mode_env)
       overrides = @host.subscription_facet.candlepin_consumer.content_overrides
       results = content.map { |product_content| Katello::ProductContentPresenter.new(product_content, overrides) }
 

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

@@ -366,9 +366,9 @@ module Katello
       upload_ids = uploads.map { |upload| upload['id'] }
       unit_keys = uploads.map do |upload|
         if @repository.file?
-          upload.except('id').except('name')
-        else
           upload.except('id')
+        else
+          upload.except('id').except('name')
         end
       end
 

data/app/lib/actions/katello/product/create.rb

@@ -29,6 +29,10 @@ module Actions
           end
         end
 
+        def run
+          ::Katello::Repository.ensure_sync_notification
+        end
+
         def finalize
           product = ::Katello::Product.find(input[:product][:id])
           product.cp_id = input[:cp_id]

data/app/lib/actions/pulp/consumer/generate_applicability.rb

@@ -7,11 +7,7 @@ module Actions
         end
 
         def invoke_external_task
-          if input[:uuids].length == 1
-            pulp_resources.consumer.regenerate_applicability_by_id(input[:uuids].first)
-          else
-            pulp_extensions.consumer.regenerate_applicability_by_ids(input[:uuids])
-          end
+          pulp_extensions.consumer.regenerate_applicability_by_ids(input[:uuids])
         end
       end
     end

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

@@ -10,6 +10,14 @@ module Actions
         end
 
         def run
+          # Update ssl options by themselves workaround for https://pulp.plan.io/issues/2727
+          ssl_ca_cert = input[:config].delete('ssl_ca_cert')
+          ssl_client_cert = input[:config].delete('ssl_client_cert')
+          ssl_client_key = input[:config].delete('ssl_client_key')
+
+          output[:response] = pulp_resources.repository.
+                                     update_importer(input[:repo_id], input[:id], :ssl_client_cert => ssl_client_cert,
+                                                     :ssl_client_key => ssl_client_key, :ssl_ca_cert => ssl_ca_cert)
           output[:response] = pulp_resources.repository.
               update_importer(*input.values_at(:repo_id, :id, :config))
         end

data/app/lib/katello/resources/cdn.rb

@@ -29,9 +29,16 @@ module Katello
           options.reverse_merge!(:verify_ssl => 9)
           options.assert_valid_keys(:ssl_client_key, :ssl_client_cert, :ssl_ca_file, :verify_ssl,
                                     :product)
-          if options[:ssl_client_cert]
-            options.reverse_merge!(:ssl_ca_file => CdnResource.ca_file)
+
+          ca = Katello::Repository.feed_ca_file(url)
+          if ca && URI(url).scheme == 'https'
+            options.reverse_merge!(:ssl_ca_file => ca)
+          elsif URI(url).scheme == 'https'
+            store = OpenSSL::X509::Store.new
+            store.set_default_paths
+            options.reverse_merge!(:cert_store => store)
           end
+
           load_proxy_settings
           @product = options[:product]
 
@@ -40,13 +47,21 @@ module Katello
           @options = options
         end
 
+        def self.redhat_cdn?(url)
+          url.include?(SETTINGS[:katello][:redhat_repository_url])
+        end
+
         def http_downloader
           net = net_http_class.new(@uri.host, @uri.port)
           net.use_ssl = @uri.is_a?(URI::HTTPS)
 
-          net.cert = @options[:ssl_client_cert]
-          net.key = @options[:ssl_client_key]
-          net.ca_file = @options[:ssl_ca_file]
+          if CdnResource.redhat_cdn?(@uri.to_s)
+            net.cert = @options[:ssl_client_cert]
+            net.key = @options[:ssl_client_key]
+            net.ca_file = @options[:ssl_ca_file] if @options[:ssl_ca_file]
+          else
+            net.cert_store = @options[:cert_store]
+          end
 
           # NOTE: This was added because some proxies dont support SSLv23 and do not handle TLS 1.2
           # Valid values in ruby 1.9.3 are 'SSLv23' or 'TLSV1'

data/app/models/katello/activation_key.rb

@@ -101,11 +101,30 @@ module Katello
           Rails.logger.error("Pool #{pool.id} is missing its subscription id.")
         end
       end
-      all_products.flatten!
+      all_products.uniq.flatten
     end
 
-    def available_content
-      self.products ? self.products.map(&:available_content).flatten.uniq { |product| product.content.id } : []
+    def all_products
+      Katello::Product.joins(:subscriptions => :pools).where(:organization_id => organization.id).enabled.uniq
+    end
+
+    def available_content(content_access_mode_all = false, content_access_mode_env = false)
+      if content_access_mode_env
+        return [] unless environment_id && content_view_id
+        version = ContentViewVersion.in_environment(environment_id).where(:content_view_id => content_view_id).first
+        content_view_version_id = version.id
+      end
+
+      if content_access_mode_all
+        content = all_products.flat_map do |product|
+          product.available_content(content_view_version_id)
+        end
+      else
+        content = products.flat_map do |product|
+          product.available_content(content_view_version_id)
+        end
+      end
+      content.uniq
     end
 
     def valid_content_override_label?(content_label)

data/app/models/katello/candlepin/content.rb

@@ -67,7 +67,7 @@ module Katello
           :name => name,
           :label => label,
           :url => feed_url,
-          :feed_ca => ca,
+          :feed_ca => ::Katello::Repository.feed_ca_cert(feed_url),
           :feed_cert => certificate_and_key[:cert],
           :feed_key => certificate_and_key[:key],
           :content_type => katello_content_type,
@@ -173,10 +173,6 @@ module Katello
           ""
         end
       end
-
-      def ca
-        File.read(::Katello::Resources::CDN::CdnResource.ca_file)
-      end
     end
 
     class DockerRepositoryMapper
@@ -216,7 +212,7 @@ module Katello
                                  :docker_upstream_name => registry["name"],
                                  :label => label,
                                  :url => feed_url,
-                                 :feed_ca => ca,
+                                 :feed_ca => ::Katello::Repository.feed_ca_cert(feed_url),
                                  :feed_cert => product.certificate,
                                  :feed_key => product.key,
                                  :content_type => ::Katello::Repository::DOCKER_TYPE,
@@ -251,10 +247,6 @@ module Katello
       def relative_path
         ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(product.organization.library, content.contentUrl)
       end
-
-      def ca
-        File.read(::Katello::Resources::CDN::CdnResource.ca_file)
-      end
     end
   end
 end

data/app/models/katello/errata_status.rb

@@ -11,7 +11,7 @@ module Katello
 
     def to_label(_options = {})
       installable = Setting[:errata_status_installable]
-      case to_status
+      case status
       when NEEDED_SECURITY_ERRATA
         installable ? N_("Security errata installable") : N_("Security errata applicable")
       when NEEDED_ERRATA
@@ -26,7 +26,7 @@ module Katello
     end
 
     def to_global(_options = {})
-      case to_status
+      case status
       when NEEDED_SECURITY_ERRATA
         ::HostStatus::Global::ERROR
       when NEEDED_ERRATA

data/app/models/katello/glue/provider.rb

@@ -95,11 +95,13 @@ module Katello
         #ca_file = '/etc/candlepin/certs/upstream/subscription.rhn.stage.redhat.com.crt'
         ca_file = nil
 
-        capabilities = Resources::Candlepin::CandlepinPing.ping['managerCapabilities'].inject([]) do |result, element|
+        params = {}
+        params[:capabilities] = Resources::Candlepin::CandlepinPing.ping['managerCapabilities'].inject([]) do |result, element|
           result << {'name' => element}
         end
+        params[:facts] = {:distributor_version => 'sat-6.3'}
         Resources::Candlepin::UpstreamConsumer.update("#{url}#{upstream['uuid']}", upstream['idCert']['cert'],
-                                                      upstream['idCert']['key'], ca_file, :capabilities => capabilities)
+                                                      upstream['idCert']['key'], ca_file, params)
       end
 
       def owner_upstream_export(upstream, zip_file_path, _options)

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

@@ -215,11 +215,11 @@ module Katello
             :ssl_client_key => ueber_cert[:key],
             :ssl_ca_cert => ::Cert::Certs.ca_cert
           }
-        elsif self.try(:redhat?) && self.content_view.default?
+        elsif self.try(:redhat?) && self.content_view.default? && Katello::Resources::CDN::CdnResource.redhat_cdn?(url)
           importer_options = {
             :ssl_client_cert => self.product.certificate,
             :ssl_client_key => self.product.key,
-            :ssl_ca_cert => Resources::CDN::CdnResource.ca_file_contents
+            :ssl_ca_cert => Katello::Repository.feed_ca_cert(url)
           }
         else
           importer_options = {

data/app/models/katello/product.rb

@@ -214,9 +214,10 @@ module Katello
       repositories.any?(&:url?)
     end
 
-    def available_content
+    def available_content(content_view_version_id = nil)
       self.productContent.select do |content|
-        self.repositories.subscribable.where(content_id: content.content.id).exists?
+        repos = self.repositories.subscribable.where(content_id: content.content.id)
+        repos.exists? && (content_view_version_id.nil? || repos.where(content_view_version_id: content_view_version_id.to_i).count > 0)
       end
     end
 

data/app/models/katello/provider.rb

@@ -22,7 +22,6 @@ module Katello
                                              :allow_blank => false, :message => "Please select provider type from one of the following: #{TYPES.join(', ')}."}
     validate :constraint_redhat_update
     validate :only_one_rhn_provider
-    validate :only_cdn_https
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
     validates_with Validators::KatelloUrlFormatValidator, :if => :redhat_provider?,
                                                           :attributes => [:repository_url]
@@ -34,12 +33,6 @@ module Katello
     scope :custom, -> { where(:provider_type => CUSTOM) }
     scope :anonymous, -> { where(:provider_type => ANONYMOUS) }
 
-    def only_cdn_https
-      if repository_url.present? && repository_url.downcase.start_with?('https') && !repository_url.downcase.start_with?('https://cdn.redhat.com')
-        errors.add(:base, _("HTTPS URLs are not supported, with the exception of 'cdn.redhat.com'"))
-      end
-    end
-
     def self.create_anonymous!(organization)
       create!(:name => SecureRandom.uuid, :description => nil,
               :organization => organization, :provider_type => ANONYMOUS,

data/app/models/katello/repository.rb

@@ -207,6 +207,15 @@ module Katello
         .where("#{Katello::ContentViewVersion.table_name}.content_view_id" => views.map(&:id))
     end
 
+    def self.feed_ca_cert(url)
+      file = feed_ca_file(url)
+      File.read(file) if file
+    end
+
+    def self.feed_ca_file(url)
+      ::Katello::Resources::CDN::CdnResource.ca_file if ::Katello::Resources::CDN::CdnResource.redhat_cdn?(url)
+    end
+
     def archive?
       self.environment.nil?
     end

data/app/services/katello/candlepin/consumer.rb

@@ -121,8 +121,28 @@ module Katello
         Katello::Product.joins(:subscriptions => :pools).where("#{Katello::Pool.table_name}.cp_id" => pool_ids).enabled.uniq
       end
 
-      def available_product_content
-        products.flat_map(&:available_content)
+      def all_products
+        org_id = ::Katello::Host::SubscriptionFacet.find_by_uuid(self.uuid).host.organization.id
+        Katello::Product.joins(:subscriptions => :pools).where(:organization_id => org_id).enabled.uniq
+      end
+
+      def available_product_content(content_access_mode_all = false, content_access_mode_env = false)
+        if content_access_mode_env
+          host = ::Katello::Host::ContentFacet.find_by_uuid(self.uuid)
+          return [] unless host.lifecycle_environment_id && host.content_view_id
+          version = ContentViewVersion.in_environment(host.lifecycle_environment_id).where(:content_view_id => host.content_view_id).first
+          content_view_version_id = version.id
+        end
+        if content_access_mode_all
+          content = all_products.flat_map do |product|
+            product.available_content(content_view_version_id)
+          end
+        else
+          content = products.flat_map do |product|
+            product.available_content(content_view_version_id)
+          end
+        end
+        content.uniq
       end
 
       def compliance_reasons

data/app/views/foreman/smart_proxies/_content_sync.html.erb

@@ -8,7 +8,7 @@
     {{ syncTask.progressbar.value || 0 | number: 0 }}%
     <a href="<%= @task_search_url %>" target="_self">
       <div ng-class="{ active: isTaskInProgress(syncTask) }" class="progress progress-striped">
-        <span progressbar
+        <span uib-progressbar
           animate="false"
           value="syncTask.progressbar.value || 0"
           type="{{ progressbarType(syncTask) }}"></span>

data/app/views/katello/api/v2/content_facet/base.json.rabl

@@ -2,6 +2,7 @@ attributes :id, :uuid
 attributes :content_view_id, :content_view_name
 attributes :lifecycle_environment_id, :lifecycle_environment_name
 attributes :content_source_id, :content_source_name
+attributes :kickstart_repository_id
 
 child :content_view => :content_view do
   attributes :id, :name

data/app/views/katello/api/v2/errata/_counts.json.rabl

@@ -1,15 +1,17 @@
-node :security do |presenter|
-  presenter.relation.security.count
+totals = @object.relation.group(:errata_type).count.with_indifferent_access
+
+node :security do |_presenter|
+  totals[:security]
 end
 
-node :bugfix do |presenter|
-  presenter.relation.bugfix.count
+node :bugfix do |_presenter|
+  totals[:bugfix]
 end
 
-node :enhancement do |presenter|
-  presenter.relation.enhancement.count
+node :enhancement do |_presenter|
+  totals[:enhancement]
 end
 
-node :total do |presenter|
-  presenter.relation.count
+node :total do |_presenter|
+  totals.values.inject(:+)
 end

data/app/views/katello/api/v2/hostgroups_extensions/show.json.rabl

@@ -1,3 +1,3 @@
 object @hostgroup
 extends 'api/v2/hostgroups/show'
-attributes :content_source_id, :content_source_name, :content_view_id, :content_view_name, :lifecycle_environment_id, :lifecycle_environment_name
+attributes :content_source_id, :content_source_name, :content_view_id, :content_view_name, :lifecycle_environment_id, :lifecycle_environment_name, :kickstart_repository_id

data/db/seeds.d/75-job_templates.rb

@@ -3,7 +3,12 @@ if Katello.with_remote_execution?
     JobTemplate.without_auditing do
       Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")].each do |template|
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-        JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+        # import! was renamed to import_raw! around 1.3.1
+        if JobTemplate.respond_to?('import_raw!')
+          JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+        else
+          JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+        end
       end
     end
   end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js

@@ -16,7 +16,7 @@
 angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySetsController',
     ['$scope', 'translate', 'Nutupane', 'ActivationKey', 'ContentOverrideHelper', 'GlobalNotification', 'CurrentOrganization',
     function ($scope, translate, Nutupane, ActivationKey, ContentOverrideHelper, GlobalNotification, CurrentOrganization) {
-        var nutupane, params, saveContentOverride, success, error;
+        var params, saveContentOverride, success, error;
 
         params = {
             id: $scope.$stateParams.activationKeyId,
@@ -27,13 +27,23 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
         };
 
         $scope.controllerName = 'katello_products';
-        nutupane = new Nutupane(ActivationKey, params, 'repositorySets');
-        $scope.table = nutupane.table;
+        $scope.nutupane = new Nutupane(ActivationKey, params, 'repositorySets');
+        $scope.table = $scope.nutupane.table;
+
+        $scope.contentAccessModes = {
+            contentAccessModeAll: false,
+            contentAccessModeEnv: false
+        };
+        $scope.toggleFilters = function () {
+            $scope.nutupane.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
+            $scope.nutupane.table.params['content_access_mode_all'] = $scope.contentAccessModes.contentAccessModeAll;
+            $scope.nutupane.refresh();
+        };
 
         success = function () {
             $scope.table.working = false;
             GlobalNotification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));
-            nutupane.refresh();
+            $scope.nutupane.refresh();
         };
 
         error = function (response) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -5,17 +5,8 @@
     <h2>{{ activationKey.name }}</h2>
   </header>
 
-  <div data-block="item-actions">
-    <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-        <span class="sr-only" translate>Toggle Dropdown</span>
-      </button>
-
+  <div data-block="item-actions" bst-feature-flag="custom_products">
+    <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
         <li role="menuitem" ng-hide="denied('create_activation_key')">
           <a ui-sref="activation-key.copy" translate>
@@ -36,7 +27,7 @@
         <div data-block="modal-header" translate>Remove Activation Key "{{ activationKey.name }}"?</div>
         <div data-block="modal-body" translate>Are you sure you want to remove Activation Key "{{ activationKey.name }}"?</div>
       </div>
-    </div>
+    </span>
   </div>
 
   <nav data-block="navigation">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html

@@ -16,17 +16,20 @@
            ng-model="repositorySetFilter"/>
   </div>
 
-  <div data-block="list-actions">
-    <div class="btn-group" uib-dropdown keyboard-nav>
-
-      <button class="btn btn-default" type="button" uib-dropdown-toggle translate>
-        Select Action
-      </button>
+  <div data-block="filters">
+    <label class="checkbox-inline" title="{{ 'Show all Repository Sets in Organization' | translate }}">
+      <input type="checkbox" ng-model="contentAccessModes.contentAccessModeAll" ng-change="toggleFilters()"/>
+      <span translate>Show All</span>
+    </label>
+    <label class="checkbox-inline" title="{{ 'Limit Repository Sets to only those available in this Activation Key\'s Lifecycle Environment' | translate }}">
+      <input type="checkbox" ng-model="contentAccessModes.contentAccessModeEnv" ng-change="toggleFilters()"/>
+      <span translate>Limit to Environment</span>
+    </label>
+  </div>
 
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-      </button>
 
+  <div data-block="list-actions">
+    <div class="btn-group" select-action-dropdown>
       <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
         <li role="menuitem" ng-show="permitted('edit_activation_keys', activationKey)" ng-class="{disabled: table.numSelected === 0}">
           <a ng-click="overrideToEnabled()" disable-link="table.numSelected === 0" translate>
@@ -82,4 +85,4 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/api-error-handler.service.js

@@ -9,7 +9,7 @@
      *   Provides common functionality in handling Katello/Foreman API Errors.
      */
     function ApiErrorHandler(translate, GlobalNotification) {
-        this.handleGETRequestErrors = function (response, $scope) {
+        function handleError(response, $scope, defaultErrorMessage) {
             var hasScopeErrorMessages = $scope && $scope.hasOwnProperty('errorMessages');
 
             if (response.hasOwnProperty('data') && response.data.hasOwnProperty('errors')) {
@@ -22,20 +22,28 @@
                 }
             } else {
                 if (hasScopeErrorMessages) {
-                    $scope.errorMessages = [translate('Something went wrong when retrieving the resource.')];
+                    $scope.errorMessages = [defaultErrorMessage];
                 } else {
-                    GlobalNotification.setErrorMessage(translate('Something went wrong when retrieving the resource.'));
+                    GlobalNotification.setErrorMessage(defaultErrorMessage);
                 }
             }
 
             if ($scope && $scope.hasOwnProperty('panel')) {
                 $scope.panel.error = true;
             }
+        }
+
+        this.handleGETRequestErrors = function (response, $scope) {
+            var defaultErrorMessage = translate('Something went wrong when retrieving the resource.');
+            handleError(response, $scope, defaultErrorMessage);
+        };
+
+        this.handlePUTRequestErrors = function (response, $scope) {
+            var defaultErrorMessage = translate('Something went wrong when saving the resource.');
+            handleError(response, $scope, defaultErrorMessage);
         };
     }
 
     angular.module('Bastion.common').service('ApiErrorHandler', ApiErrorHandler);
-
     ApiErrorHandler.$inject = ['translate', 'GlobalNotification'];
-
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/select-action-dropdown.directive.js

@@ -0,0 +1,45 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc directive
+     * @name Bastion.common.directive:selectActionDropdown
+     *
+     * @description
+     *   Used to create a dropdown menu with a list of actions in it and the words "Select Action" on the button.
+     *
+     *   Necessary because of https://github.com/angular-ui/bootstrap/issues/5841
+     *
+     * @example
+     *  <span select-action-dropdown>
+     *    <ul>...</ul>
+     *  </span>
+     */
+    function selectActionDropdown() {
+        return {
+            restrict: 'AE',
+            transclude: true,
+            scope: true,
+            templateUrl: 'common/views/select-action-dropdown.html',
+            compile: function (tElement, tAttribute, transclude) {
+                return function (scope, element) {
+                    scope.status = {
+                        isOpen: false
+                    };
+
+                    scope.toggleDropdown = function (event) {
+                        event.preventDefault();
+                        event.stopPropagation();
+                        scope.status.isOpen = !scope.status.isOpen;
+                    };
+
+                    transclude(scope, function(clone) {
+                        element.find('.btn-group').append(clone);
+                    });
+                };
+            }
+        };
+    }
+
+    angular.module('Bastion.common').directive('selectActionDropdown', selectActionDropdown);
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/select-action-dropdown.html

@@ -0,0 +1,10 @@
+<div class="btn-group" uib-dropdown is-open="status.isOpen" keyboard-nav>
+  <button type="button" class="btn btn-default" ng-click="toggleDropdown($event)">
+    <span translate>Select Action</span>
+  </button>
+
+  <button type="button" class="btn btn-default" uib-dropdown-toggle>
+    <span class="caret"></span>
+    <span class="sr-only" translate>Toggle Dropdown</span>
+  </button>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js

@@ -16,7 +16,7 @@
 angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsController',
     ['$scope', 'translate', 'Nutupane', 'HostSubscription', 'ContentOverrideHelper', 'GlobalNotification', 'CurrentOrganization',
     function ($scope, translate, Nutupane, HostSubscription, ContentOverrideHelper, GlobalNotification, CurrentOrganization) {
-        var nutupane, params, saveContentOverride, success, error;
+        var params, saveContentOverride, success, error;
 
         params = {
             id: $scope.$stateParams.hostId,
@@ -27,13 +27,23 @@ angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsCon
         };
 
         $scope.controllerName = 'katello_products';
-        nutupane = new Nutupane(HostSubscription, params, 'repositorySets');
-        $scope.table = nutupane.table;
+        $scope.nutupane = new Nutupane(HostSubscription, params, 'repositorySets');
+        $scope.table = $scope.nutupane.table;
+
+        $scope.contentAccessModes = {
+            contentAccessModeAll: false,
+            contentAccessModeEnv: false
+        };
+        $scope.toggleFilters = function () {
+            $scope.nutupane.table.params['content_access_mode_all'] = $scope.contentAccessModes.contentAccessModeAll;
+            $scope.nutupane.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
+            $scope.nutupane.refresh();
+        };
 
         success = function () {
             $scope.table.working = false;
             GlobalNotification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));
-            nutupane.refresh();
+            $scope.nutupane.refresh();
         };
 
         error = function (response) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html

@@ -23,17 +23,19 @@
              ng-model="repositorySetFilter"/>
     </div>
 
-    <div data-block="list-actions">
-      <div class="btn-group" uib-dropdown keyboard-nav>
-
-        <button class="btn btn-default" type="button" uib-dropdown-toggle>
-          <span translate>Select Action</span>
-        </button>
-
-        <button type="button" class="btn btn-default" uib-dropdown-toggle>
-          <span class="caret"></span>
-        </button>
+    <div data-block="filters">
+      <label class="checkbox-inline" title="{{ 'Show all Repository Sets in Organization' | translate }}">
+        <input type="checkbox" ng-model="contentAccessModes.contentAccessModeAll" ng-change="toggleFilters()"/>
+        <span translate>Show All</span>
+      </label>
+      <label class="checkbox-inline" title="{{ 'Limit Repository Sets to only those available in this Host\'s Lifecycle Environment' | translate }}">
+        <input type="checkbox" ng-model="contentAccessModes.contentAccessModeEnv" ng-change="toggleFilters()"/>
+        <span translate>Limit to Environment</span>
+      </label>
+    </div>
 
+    <div data-block="list-actions">
+      <span select-action-dropdown>
         <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
           <li role="menuitem" ng-show="permitted('edit_activation_keys', activationKey)" ng-class="{disabled: table.numSelected === 0}">
             <a ng-click="overrideToEnabled()" disable-link="table.numSelected === 0" translate>
@@ -53,7 +55,7 @@
             </a>
           </li>
         </ul>
-      </div>
+      </span>
     </div>
 
     <span data-block="no-rows-message" translate>
@@ -90,4 +92,4 @@
       </table>
     </div>
   </div>
-</div>
+</div>

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

@@ -12,15 +12,7 @@
       <span translate>Register Content Host</span>
     </button>
 
-    <div class="btn-group" uib-dropdown keyboard-nav>
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-      </button>
-
+    <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
         <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
           <a ng-click="openHostCollectionsModal()" disable-link="table.numSelected === 0" translate>Change Host Collections</a>
@@ -49,7 +41,7 @@
           <span bst-modal="performDestroyHosts()" template-url="content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html"></span>
         </li>
       </ul>
-    </div>
+    </span>
   </div>
 
   <span data-block="no-rows-message" translate>

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

@@ -13,38 +13,30 @@
   </div>
 
   <nav data-block="item-actions">
-    <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-        <span class="sr-only" translate>Toggle Dropdown</span>
-      </button>
-
-      <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
-        <li role="menuitem" ng-hide="denied('publish_content_views', contentView)">
-          <a ui-sref="content-view.publish">
-            <span translate>Publish New Version</span>
-          </a>
-        </li>
-
-        <li role="menuitem" ng-hide="denied('publish_content_views', contentView)">
-          <a ui-sref="content-view.copy">
-            <span translate>Copy Content View</span>
-          </a>
-        </li>
-
-        <li class="divider" ng-hide="denied('destroy_content_views', contentView)"></li>
-
-        <li role="menuitem" ng-hide="denied('destroy_content_views', contentView)">
-          <a ui-sref="content-view.deletion">
-            <span translate>Remove Content View</span>
-          </a>
-        </li>
-      </ul>
-    </div>
+    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView)"
+            ui-sref="content-view.publish">
+      <span translate>Publish New Version</span>
+    </button>
+
+    <span bst-feature-flag="custom_products">
+      <span select-action-dropdown>
+        <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
+          <li role="menuitem" ng-hide="denied('publish_content_views', contentView)">
+            <a ui-sref="content-view.copy">
+              <span translate>Copy Content View</span>
+            </a>
+          </li>
+
+          <li class="divider" ng-hide="denied('destroy_content_views', contentView)"></li>
+
+          <li role="menuitem" ng-hide="denied('destroy_content_views', contentView)">
+            <a ui-sref="content-view.deletion">
+              <span translate>Remove Content View</span>
+            </a>
+          </li>
+        </ul>
+      </span>
+    </span>
   </nav>
 
   <nav data-block="navigation">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-info.html

@@ -5,14 +5,14 @@
     <dl class="dl-horizontal dl-horizontal-left">
       <dt translate>Product</dt>
       <dd>
-        <a ui-sref="products.details.info({productId: tag.product.id})">
+        <a ui-sref="product.info({productId: tag.product.id})">
           {{ tag.product.name }}
         </a>
       </dd>
 
       <dt translate>Repository</dt>
       <dd>
-        <a ui-sref="products.details.repositories.manage-content.docker-manifests({productId: tag.product.id, repositoryId: tag.repository.id})">
+        <a ui-sref="product.repository.manage-content.docker-manifests({productId: tag.product.id, repositoryId: tag.repository.id})">
           {{ tag.repository.name }}
         </a>
       </dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-details.html

@@ -6,16 +6,7 @@
   </div>
 
   <div data-block="item-actions">
-    <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-
-      <button type="button" type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-        <span class="sr-only" translate>Toggle Dropdown</span>
-      </button>
-
+    <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
         <li role="menuitem" ng-hide="denied('create_host_collections')">
           <a ui-sref="host-collection.copy" translate>
@@ -36,7 +27,7 @@
         <div data-block="modal-header" translate>Remove Host Collection "{{ hostCollection.name }}"?</div>
         <div data-block="modal-body" translate>Are you sure you want to remove Host Collection "{{ hostCollection.name }}"?</div>
       </div>
-    </div>
+    </span>
   </div>
 
   <nav data-block="navigation" ng-hide="isState('host-collection.copy')">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch-repositories.html

@@ -51,7 +51,7 @@
             </a>
           </td>
           <td bst-table-cell>
-            <a ui-sref="products.details.repositories.index({productId: repository.product.id})">
+            <a ui-sref="product.repositories({productId: repository.product.id})">
               {{ repository.product.name }}
             </a>
           </td>

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

@@ -5,17 +5,8 @@
     <h2 translate>{{ repository.name }}</h2>
   </header>
 
-  <div data-block="item-actions">
-    <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-        <span class="sr-only" translate>Toggle Dropdown</span>
-      </button>
-
+  <div data-block="item-actions" bst-feature-flag="custom_products">
+    <span select-action-dropdown>
       <ul class="dropdown-menu-right" uib-dropdown-menu role="menu">
         <li role="menuitem" ng-hide="hideSyncButton(repository, false)" ng-class="{disabled: disableSyncLink()}">
           <a ng-click="syncRepository(repository)" disable-link="disableSyncLink()" translate>
@@ -92,7 +83,7 @@
         <div data-block="modal-header" translate>Remove Repository "{{ repository.name }}"?</div>
         <div data-block="modal-body" translate>Are you sure you want to remove repository "{{ repository.name }}"?</div>
       </div>
-    </div>
+    </span>
   </div>
 
   <div data-block="content">

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

@@ -5,16 +5,8 @@
     <h2 translate>{{ product.name }}</h2>
   </header>
 
-  <nav data-block="item-actions">
-    <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-        <span class="sr-only" translate>Toggle Dropdown</span>
-      </button>
-
+  <nav data-block="item-actions" bst-feature-flag="custom_products">
+    <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
         <li role="menuitem" ng-hide="denied('sync_products', product)">
           <a ng-click="syncProduct()">
@@ -58,7 +50,7 @@
           </span>
         </li>
       </ul>
-    </div>
+    </span>
 
     <div bst-modal="removeProduct(product)" model="product">
       <div data-block="modal-header" translate>Remove Product "{{ product.name }}"?</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/views/products.html

@@ -21,16 +21,7 @@
       <span translate>Repo Discovery</span>
     </button>
 
-    <div class="btn-group" uib-dropdown keyboard-nav>
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-        <span class="sr-only" translate>Toggle Dropdown</span>
-      </button>
-
+    <span select-action-dropdown>
       <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
         <li role="menuitem" ng-class="{disabled: table.numSelected === 0}">
           <a ng-click="syncProducts()" ng-show="permitted('sync_products')" disable-link="table.numSelected === 0" translate>
@@ -71,7 +62,7 @@
           </div>
         </li>
       </ul>
-    </div>
+    </span>
   </div>
 
   <span data-block="no-rows-message" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-details.html

@@ -13,17 +13,8 @@
     </div>
   </div>
 
-  <nav data-block="item-actions">
-    <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span translate>Select Action</span>
-      </button>
-
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
-        <span class="caret"></span>
-        <span class="sr-only" translate>Toggle Dropdown</span>
-      </button>
-
+  <nav data-block="item-actions" bst-feature-flag="custom_products">
+    <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
         <li role="menuitem" ng-hide="denied('sync_products')">
           <a ng-click="runSyncPlan()">
@@ -44,7 +35,7 @@
         <div data-block="modal-header" translate>Remove Sync Plan "{{ syncPlan.name }}"?</div>
         <div data-block="modal-body" translate>Are you sure you want to remove Sync Plan "{{ syncPlan.name }}"?</div>
       </div>
-    </div>
+    </span>
   </nav>
 
   <nav data-block="navigation">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-products.html

@@ -63,7 +63,7 @@
       <tbody>
         <tr bst-table-row ng-repeat="product in table.rows" row-select="product">
           <td bst-table-cell>
-            <a ui-sref="products.details.info({productId: product.id})">
+            <a ui-sref="product.info({productId: product.id})">
               {{ product.name }}
             </a>
           </td>

data/lib/katello/plugin.rb

@@ -244,13 +244,13 @@ Foreman::Plugin.register :katello do
 
   add_controller_action_scope(HostsController, :index) do |base_scope|
     base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
-      .preload(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
+      .preload(:content_view, :lifecycle_environment, :subscription_facet)
+      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
   end
 
   add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
     base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
-      .preload(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
+      .preload(:content_view, :lifecycle_environment, :subscription_facet)
+      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
   end
 end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.4.0.2".freeze
+  VERSION = "3.4.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.4.0.2
+  version: 3.4.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1435,7 +1435,9 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/capsules/capsules.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/api-error-handler.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/common.module.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/common/select-action-dropdown.directive.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/registration.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/select-action-dropdown.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-environment-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js