katello 3.3.1.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65fd921479387a4448f64459f4bcb9a4841fb1fc
-  data.tar.gz: 97b99adf9023236ed49eed8180a2021022ad860a
+  metadata.gz: 1aafb92d51f13eb142a3d6336be8e73f13fc70f3
+  data.tar.gz: f2d506e35428a7e34ab70860dfe1b4d2b46a64da
 SHA512:
-  metadata.gz: 25ddf04e66b2045ad4c774429cfc3452ee3bea5213ecd5f75a021d59c0091790df849ea3cde02bb71a51de7503d20fdd83401a26f8b7eb75e0b070b38ec3073d
-  data.tar.gz: 71a0bdc2008295a4730389e19b39831ad958caf4493d274ce87c7a9cd79f1e0081a7ff6a000477cf129fad6f3bd6c998ccdac914edcb5d1a923182737ca22193
+  metadata.gz: 65f5203e595cebe8d47f169443ea88e5d84cc83bee0c4a998eaf19f2099dffa1afc9724e55840dcfe21b4d5258c85ff406718b96765698967cb4fb5038612d5f
+  data.tar.gz: 93580eae8da88bf7513fe39c613479a44dc0b3322c2948d6e10296fd5c61c8f2707aa98544c41810fde07880c1af5688e28e75fcf3b5cdd91bc06f36ff073951

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

@@ -258,7 +258,8 @@ module Katello
     end
 
     def facts
-      sync_task(::Actions::Katello::Host::Update, @host, rhsm_params)
+      User.current = User.anonymous_admin
+      async_task(::Actions::Katello::Host::Update, @host, rhsm_params)
       update_host_registered_through(@host, request.headers)
       render :json => {:content => _("Facts successfully updated.")}, :status => 200
     end

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

@@ -111,7 +111,10 @@ module Katello
       custom_sort = ->(sort_query) { sort_query.order('author, name, sortable_version DESC') }
       sorted_records = scoped_search(query, nil, nil, :resource_class => PuppetModule, :custom_sort => custom_sort)
       if params[:name]
-        sorted_records[:results] = add_use_latest_records(sorted_records[:results].to_a, selected_latest_versions)
+        sorted_records_with_use_latest = add_use_latest_records(sorted_records[:results].to_a, selected_latest_versions)
+        sorted_records[:results] = sorted_records_with_use_latest
+        sorted_records[:total] = sorted_records_with_use_latest.count
+        sorted_records[:subtotal] = sorted_records_with_use_latest.count
       end
       respond_for_index :template => 'puppet_modules', :collection => sorted_records
     end

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

@@ -31,6 +31,9 @@ module Actions
                                                     importer,
                                                     distributors,
                                                     display_name: input[:name])
+        rescue RestClient::Conflict
+          Rails.logger.warn("Tried to add repository #{input[:pulp_id]} that already exists.")
+          []
         end
 
         def importer

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

@@ -39,9 +39,10 @@ module Katello
                  :through    => :capsule_lifecycle_environments,
                  :source     => :lifecycle_environment
 
-        has_many :hosts,      :class_name => "::Host::Managed", :foreign_key => :content_source_id,
-                              :inverse_of => :content_source
-        has_many :hostgroups, :class_name => "::Hostgroup",     :foreign_key => :content_source_id,
+        has_many :content_facets, :class_name => "::Katello::Host::ContentFacet", :foreign_key => :content_source_id,
+                                  :inverse_of => :content_source
+
+        has_many :hostgroups, :class_name => "::Hostgroup", :foreign_key => :content_source_id,
                               :inverse_of => :content_source
 
         validates :download_policy, inclusion: {

data/app/models/katello/host/content_facet.rb

@@ -7,7 +7,7 @@ module Katello
       belongs_to :kickstart_repository, :class_name => "::Katello::Repository", :foreign_key => :kickstart_repository_id, :inverse_of => :kickstart_content_facets
       belongs_to :content_view, :inverse_of => :content_facets, :class_name => "Katello::ContentView"
       belongs_to :lifecycle_environment, :inverse_of => :content_facets, :class_name => "Katello::KTEnvironment"
-      belongs_to :content_source, :class_name => "::SmartProxy", :foreign_key => :content_source_id, :inverse_of => :hosts
+      belongs_to :content_source, :class_name => "::SmartProxy", :foreign_key => :content_source_id, :inverse_of => :content_facets
 
       has_many :applicable_errata, :through => :content_facet_errata, :class_name => "Katello::Erratum", :source => :erratum
       has_many :content_facet_errata, :class_name => "Katello::ContentFacetErratum", :dependent => :destroy, :inverse_of => :content_facet

data/db/migrate/20170321012632_fill_in_content_view_components.rb

@@ -0,0 +1,32 @@
+class FillInContentViewComponents < ActiveRecord::Migration
+  class FakeContentView < ActiveRecord::Base
+    self.table_name = 'katello_content_views'
+
+    has_many :content_view_components, :class_name => "FakeContentViewVersion", :dependent => :destroy,
+             :inverse_of => :composite_content_view, :foreign_key => :composite_content_view_id
+  end
+
+  class FakeContentViewVersion < ActiveRecord::Base
+    self.table_name = 'katello_content_view_versions'
+
+    has_many :content_view_components, :inverse_of => :content_view_version, :dependent => :destroy, :class_name => 'FakeContentViewComponent'
+  end
+
+  class FakeContentViewComponent < ActiveRecord::Base
+    self.table_name = 'katello_content_view_components'
+
+    belongs_to :content_view_version, :class_name => "FakeContentViewVersion",
+                              :inverse_of => :content_view_components
+    belongs_to :content_view, :class_name => "FakeContentView",
+                              :inverse_of => :component_composites
+  end
+
+  def up
+    FakeContentViewComponent.find_each do |cvc|
+      if cvc.content_view_id.nil? && cvc.content_view_version_id
+        cvc.content_view_id = cvc.content_view_version.content_view_id
+        cvc.save!
+      end
+    end
+  end
+end

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

@@ -37,7 +37,10 @@
 
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
-          {{ name }}
+          <td class="row-select"></td>
+          <td colspan="8">
+           {{ name }}
+          </td>
         </tr>
         <tr bst-table-row 
             ng-repeat-end

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

@@ -36,7 +36,10 @@
 
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions | groupedFilter: subscriptionSearch">
-          {{ name }}
+          <td class="row-select"></td>
+          <td colspan="8">
+           {{ name }}
+          </td>
         </tr>
         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
           <td bst-table-cell>{{ subscription | subscriptionAttachAmountFilter }}</td>

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

@@ -42,7 +42,6 @@
            <td colspan="8">
             {{ name }}
            </td>
-           <td bst-table-cell colspan="8"></td>
          </tr>
          <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
            <td bst-table-cell>

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

@@ -50,10 +50,10 @@
 
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions | groupedFilter: subscriptionSearch">
-          <td class="row-select">
-              {{ name }}
+          <td class="row-select"></td>
+          <td colspan="8">
+           {{ name }}
           </td>
-          <td bst-table-cell colspan="8"></td>
         </tr>
         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
           <td bst-table-cell>{{ subscription.quantity_consumed }}</td>

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

@@ -19,7 +19,8 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersi
 
         params = {
             name: $scope.$stateParams.moduleName,
-            id: $scope.$stateParams.contentViewId
+            id: $scope.$stateParams.contentViewId,
+            'full_result': true
         };
 
         nutupane = new Nutupane(ContentView, params, 'availablePuppetModules');

data/lib/katello/plugin.rb

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

data/lib/katello/tasks/clean_backend_objects.rake

@@ -14,7 +14,7 @@ namespace :katello do
       if host.content_facet.try(:uuid)
         test_method { Katello.pulp_server.extensions.consumer.retrieve(host.content_facet.uuid) }
       else
-        test_method { false }
+        false
       end
     end
 
@@ -22,9 +22,9 @@ namespace :katello do
       if host.subscription_facet && host.subscription_facet.uuid
         test_method { ::Katello::Resources::Candlepin::Consumer.get(host.subscription_facet.uuid) }
       elsif host.subscription_facet
-        test_method { true }
+        true
       else
-        test_method { false }
+        false
       end
     end
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.3.1.1".freeze
+  VERSION = "3.3.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.3.1.1
+  version: 3.3.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dynflow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.8.24
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.8.24
 - !ruby/object:Gem::Dependency
   name: runcible
   requirement: !ruby/object:Gem::Requirement
@@ -1395,6 +1409,7 @@ files:
 - db/migrate/20161102194100_create_content_view_docker_filter_rules.rb
 - db/migrate/20161214151548_move_content_source_id_to_content_facets.rb
 - db/migrate/20170220679403_remove_system_permissions.rb
+- db/migrate/20170321012632_fill_in_content_view_components.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb