Merge pull request #4867 from ehelms/fixes-8668

Fixes #8668: Hide 'Server' kickstart repositories from enablement.
Katello · Dec 15, 2014 · 0957647 · 0957647
2 parents 1cfa24f + 9c6f26b
commit 0957647
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/app/controllers/katello/api/v2/repository_sets_controller.rb b/app/controllers/katello/api/v2/repository_sets_controller.rb
@@ -47,10 +47,20 @@ def show
     param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
     def available_repositories
       scan_cdn = sync_task(::Actions::Katello::RepositorySet::ScanCdn, @product, @product_content.content.id)
+      repos = scan_cdn.output[:results]
+
+      repos = repos.select do |repo|
+        if repo[:path].include?('kickstart')
+          repo[:substitutions][:releasever].include?('Server') ? repo[:enabled] : true
+        else
+          true
+        end
+      end
+
       collection = {
-        :results  => scan_cdn.output[:results],
-        :subtotal => scan_cdn.output[:results].size,
-        :total    => scan_cdn.output[:results].size
+        :results  => repos,
+        :subtotal => repos.size,
+        :total    => repos.size
       }
       respond_for_index :collection => collection
     end

diff --git a/app/controllers/katello/products_controller.rb b/app/controllers/katello/products_controller.rb
@@ -32,7 +32,17 @@ def available_repositories
         if task.result == 'warning'
           render :partial => 'katello/providers/redhat/errors', :locals => { :error_message => task_error(task), :task => task}
         else
-          render :partial => 'katello/providers/redhat/repos', :locals => { :scan_cdn => task }
+          repos = task.output[:results]
+
+          repos = repos.select do |repo|
+            if repo[:path].include?('kickstart')
+              repo[:substitutions][:releasever].include?('Server') ? repo[:enabled] : true
+            else
+              true
+            end
+          end
+
+          render :partial => 'katello/providers/redhat/repos', :locals => {:scan_cdn => task, :repos => repos}
         end
       end
     end

diff --git a/app/helpers/katello/providers_helper.rb b/app/helpers/katello/providers_helper.rb
@@ -18,6 +18,7 @@ module ProvidersHelper
     def redhat_repo_tabs
       [
         {:id => :rpms, :name => _('RPMs'), :products => {}},
+        {:id => :kickstarts, :name => _('Kickstarts'), :products => {}},
         {:id => :srpms, :name => _('Source RPMs'), :products => {}},
         {:id => :debug, :name => _('Debug RPMs'), :products => {}},
         {:id => :beta, :name => _('Beta'), :products => {}},
@@ -44,8 +45,10 @@ def redhat_repo_tab(provider, tab_id)
             key = :debug
           elsif name.include?("(ISOs)") || name.include?("Source ISOs")
             key = :isos
-          elsif name.include?("(RPMs)") || name.include?("(Kickstart)")
+          elsif name.include?("(RPMs)")
             key = :rpms
+          elsif name.include?("(Kickstart)")
+            key = :kickstarts
           else
             key = :other
           end

diff --git a/app/views/katello/providers/redhat/_repos.html.haml b/app/views/katello/providers/redhat/_repos.html.haml
@@ -5,7 +5,7 @@
     %th
       = _('Repository')
   %tbody
-    - scan_cdn.output[:results].each do |result|
+    - repos.each do |result|
       %tr.repo{:id=>"repo_#{result[:pulp_id]}"}
         %td
           %label