katello 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e6baaee12047d7f51cd5aa22e459cea411aa0bb
-  data.tar.gz: 0bbb1ba25154c5aa74c0ee4321b61a3d075c74e0
+  metadata.gz: 92f949b0b3a9201bd9163f2fca7c3898feafc2b2
+  data.tar.gz: 790bcd11ac29bad1d2053314424187189b71afce
 SHA512:
-  metadata.gz: f422c50425a46b7289e2c639a0e594e9e618ee894630eb9c76bef90e0eb49e0ad0efa2a08c3b5929c98a9723c5a17336456918e53dad909de251fe187bce5749
-  data.tar.gz: e790f13972a9c05578189375093f3854ed5158518869da5bc78fa70bfed6cb6ec7afc2efa96548b1dab84aaada62c5faa1aaa5c5fba1bcdb840ecec3a2eaa309
+  metadata.gz: cf154c344d10d11683890b9463293f69647f049cfa52dae6c92e33321473cc4b89b55bb3680c1d77a173d3038e6bf19f2258dd2abe6903bf701d12ade2bace6a
+  data.tar.gz: 04e68a24437d862d0a6fd5632c61669019795f6abb8305b5fe37229004250a91ba2599810d95793b9bceb28c927b60869aae772262ab754b7b4927f3dd8ac527

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

@@ -132,7 +132,7 @@ module Katello
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true
     def upload_package_profile
       User.as_anonymous_admin do
-        sync_task(::Actions::Katello::Host::UploadPackageProfile, @host, params[:_json])
+        async_task(::Actions::Katello::Host::UploadPackageProfile, @host, params[:_json])
       end
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end

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

@@ -49,10 +49,12 @@ module Katello
       includes = options.fetch(:includes, [])
       group = options.fetch(:group, nil)
 
-      total = query.count
+      total = scoped_search_total(query, group)
+
       query = resource.search_for(*search_options).where("#{resource.table_name}.id" => query)
 
-      sub_total = scoped_search_sub_total(query, total, group)
+      query = query.select(group).group(group) if group
+      sub_total = total.zero? ? 0 : scoped_search_total(query, group)
 
       sort_attr = params[:sort_by] || default_sort_by
 
@@ -73,7 +75,6 @@ module Katello
       end
       page = params[:page] || 1
       per_page = params[:per_page] || ::Setting::General.entries_per_page
-
       query = (total.zero? || sub_total.zero?) ? [] : query
 
       scoped_search_results(query, sub_total, total, page, per_page)
@@ -83,14 +84,12 @@ module Katello
 
     protected
 
-    def scoped_search_sub_total(query, total, group)
-      if group.present?
-        query = query.select(group).group(group)
-        sub_total = total.zero? ? 0 : query.count.length
+    def scoped_search_total(query, group)
+      if group
+        query.select(group).group(group).length
       else
-        sub_total = total.zero? ? 0 : query.count
+        query.count
       end
-      sub_total
     end
 
     def scoped_search_results(query, sub_total, total, page, per_page, error = nil)

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

@@ -78,7 +78,7 @@ module Katello
     param_group :host_collection
     def update
       @host_collection.update_attributes!(host_collection_params_with_host_ids)
-      respond
+      respond_for_show(:resource => @host_collection)
     end
 
     api :PUT, "/host_collections/:id/add_hosts", N_("Add host to the host collection")
@@ -154,7 +154,14 @@ module Katello
     end
 
     def host_collection_params
-      attrs = [:name, :description, :max_hosts, :unlimited_hosts, { :host_ids => [] }]
+      attrs = [:name,
+               :description,
+               :max_hosts,
+               :unlimited_hosts,
+               # For deep_munge; Remove for Rails 5
+               :host_ids,
+               { :host_ids => [] }
+              ]
       params.fetch(:host_collection).permit(*attrs)
     end
 

data/app/models/katello/rhsm_fact_parser.rb

@@ -27,6 +27,15 @@ module Katello
       }
     end
 
+    def interfaces
+      virtual_interface_regexp = /\A([^.]*?)\.(\d+)\z/
+      super.tap do |interfaces|
+        interfaces.each do |name, attributes|
+          attributes[:virtual] = true if name =~ virtual_interface_regexp
+        end
+      end
+    end
+
     # rubocop:disable Style/AccessorMethodName:
     def get_interfaces
       mac_keys = facts.keys.select { |f| f =~ /net\.interface\..*\.mac_address/ }

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -325,7 +325,7 @@ class MigrateContentHosts < ActiveRecord::Migration
       if hostname.nil?
         logger.warn("Content host #{system.uuid} does not have a hostname, removing.")
         unregister_system(system)
-        break
+        next
       end
 
       MigrateContentHosts::Host.reset_column_information

data/db/migrate/20160619223332_fix_viewer_role.rb

@@ -0,0 +1,41 @@
+class FixViewerRole < ActiveRecord::Migration
+  class Role < ActiveRecord::Base
+    has_many :filters
+  end
+
+  class Filter < ActiveRecord::Base
+    belongs_to :role
+    has_many :filterings, :dependent => :destroy
+    has_many :permissions, :through => :filterings
+
+    scope :unlimited, -> { where(:search => nil, :taxonomy_search => nil) }
+
+    def resource_type
+      type = @resource_type || permissions.first.try(:resource_type)
+      type.blank? ? nil : type
+    end
+  end
+
+  class Filtering < ActiveRecord::Base
+    belongs_to :filter
+    belongs_to :permission
+  end
+
+  class Permission < ActiveRecord::Base
+  end
+
+  def change
+    viewer = Role.find_by name: 'Viewer'
+    view_permission = Permission.find_by name: 'view_content_views'
+
+    unless viewer.nil?
+      filters = viewer.filters.unlimited.select { |filter| filter.resource_type == 'Katello::ContentView' }
+      unless filters.empty?
+        filters.each do |filter|
+          unwanted_filterings = filter.filterings.select { |filtering| filtering.permission_id != view_permission.id }
+          filter.filterings.delete(unwanted_filterings)
+        end
+      end
+    end
+  end
+end

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

@@ -10,16 +10,27 @@
  *   Provides functionality to the puppet modules name list.
  */
 angular.module('Bastion.content-views').controller('ContentViewPuppetModuleNamesController',
-    ['$scope', 'Nutupane', 'ContentView', function ($scope, Nutupane, ContentView) {
+    ['$scope', 'Nutupane', 'ContentView', 'CurrentOrganization', 'PuppetModule',
+    function ($scope, Nutupane, ContentView, CurrentOrganization, PuppetModule) {
 
         var nutupane = new Nutupane(
             ContentView,
             {id: $scope.$stateParams.contentViewId},
             'availablePuppetModuleNames'
         );
-
+        nutupane.masterOnly = true;
         $scope.detailsTable = nutupane.table;
 
+        $scope.detailsTable.fetchAutocomplete = function (term) {
+            var promise;
+
+            promise = PuppetModule.autocomplete({'organization_id': CurrentOrganization, search: term}).$promise;
+
+            return promise.then(function (data) {
+                return data;
+            });
+        };
+
         $scope.selectVersion = function (moduleName) {
             $scope.transitionTo('content-views.details.puppet-modules.versions',
                 {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-names.html

@@ -22,14 +22,24 @@
   <span data-block="header" translate>Select A New Puppet Module To Add</span>
   <span data-block="messages"></span>
   <div data-block="search">
+    <div class="input-group input-group">
     <input type="text"
            class="form-control"
-           placeholder="{{ 'Filter' | translate }}"
-           ng-model="filterTerm"/>
+           placeholder="{{ 'Search...' | translate }}"
+           ng-model="detailsTable.searchTerm"
+           bst-on-enter="detailsTable.search(detailsTable.searchTerm)"
+           ng-trim="false"
+           typeahead="item.label for item in detailsTable.fetchAutocomplete($viewValue)"
+           typeahead-empty
+           typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
+    <span class="input-group-btn">
+      <button ng-click="detailsTable.search(detailsTable.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
+    </span>
+    </div>
   </div>
 
   <span data-block="selection-summary"></span>
-
+  <span data-block="no-rows-message" translate>No puppet modules found</span>
   <div data-block="table">
     <table class="table table-striped table-bordered">
       <thead>

data/lib/katello/engine.rb

@@ -87,7 +87,14 @@ module Katello
       require 'katello/apipie/validators'
     end
 
-    initializer "katello.register_actions", :before => 'foreman_tasks.initialize_dynflow' do |_app|
+    # make sure the Katello plugin is initialized before `after_initialize`
+    # hook so that the resumed Dynflow tasks can rely on everything ready.
+    initializer 'katello.register_plugin', :before => :finisher_hook do
+      require 'katello/plugin'
+      require 'katello/permissions'
+    end
+
+    initializer "katello.register_actions", :before => :finisher_hook do |_app|
       ForemanTasks.dynflow.require!
       action_paths = %W(#{Katello::Engine.root}/app/lib/actions
                         #{Katello::Engine.root}/app/lib/headpin/actions
@@ -95,7 +102,7 @@ module Katello
       ForemanTasks.dynflow.config.eager_load_paths.concat(action_paths)
     end
 
-    initializer "katello.set_dynflow_middlewares", :before => 'foreman_tasks.initialize_dynflow' do |_app|
+    initializer "katello.set_dynflow_middlewares",  :before => :finisher_hook do |_app|
       # We don't enable this in test env, as it adds the new field into the actions input
       # that we are not interested in tests
       unless Rails.env.test?
@@ -105,7 +112,7 @@ module Katello
       end
     end
 
-    initializer "katello.initialize_cp_listener", after: "foreman_tasks.initialize_dynflow" do
+    initializer "katello.initialize_cp_listener", :before => :finisher_hook do
       unless ForemanTasks.dynflow.config.remote? || File.basename($PROGRAM_NAME) == 'rake' || Rails.env.test?
         ForemanTasks.dynflow.config.on_init do |world|
           ::Actions::Candlepin::ListenOnCandlepinEvents.ensure_running(world)
@@ -234,11 +241,6 @@ module Katello
       load 'katello/repository_types.rb'
     end
 
-    config.after_initialize do
-      require 'katello/plugin'
-      require 'katello/permissions'
-    end
-
     rake_tasks do
       load "#{Katello::Engine.root}/lib/katello/tasks/test.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/jenkins.rake"

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.18
 - !ruby/object:Gem::Dependency
   name: foreman_docker
   requirement: !ruby/object:Gem::Requirement
@@ -1337,6 +1337,7 @@ files:
 - db/migrate/20160413230128_add_kickstart_repository_to_hosts_and_hostgroups.rb
 - db/migrate/20160426145517_move_host_description_to_host_comment.rb
 - db/migrate/20160530184400_add_repo_id_indexes.rb
+- db/migrate/20160619223332_fix_viewer_role.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb