katello 3.9.0.rc2 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b967f06b8ebbd4d5c372ac7050103056ef3ce7
-  data.tar.gz: 200524bd0eeb8414e2fde6f9b83a25a5a3e2a132
+  metadata.gz: '091b4e68cbaf3d4f59e7e68eadb6c7614dec995d'
+  data.tar.gz: d5f981cb609b26e25e4e3115578f499965ee506a
 SHA512:
-  metadata.gz: ca4ef8d5bb1adb3fed0aea35a251bc421aef8c79a85b0dcdef212baf2ecbdd0301c7dbfa0edb166978fb637e3fbfd7e15ccb5648b753c056be970494b32c4a73
-  data.tar.gz: 519c7b6e9f4817efa2e8fedebdc6e6117228a15f3cdf196e3904458938c1fdc845535aa3a00ab70aec4e8bf242bd87840f7e5bd7b664b40a33ab7c1a11c66e87
+  metadata.gz: 0efb1494294fad86bd7b712f297daf11a1ca22dda766436fa5c59fc1c4e71db9657ce20752f60874f9126d37bd2ba04f7c2be50be7ce2921afd55e09d01338a6
+  data.tar.gz: e0b07d723a3a90e0dff8e89e5ca56030d660b3428570acb9995ec4a00b80af84a53eeac9d1c1b39d0239b513517eaa2b3b16ffeb3ab0dda79f60acb46b99e08c

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

@@ -28,7 +28,7 @@ module Actions
             if repository.redhat?
               handle_redhat_content(repository)
             else
-              handle_custom_content(repository.root) unless skip_environment_update
+              handle_custom_content(repository) unless skip_environment_update
             end
           end
 
@@ -42,10 +42,10 @@ module Actions
           end
         end
 
-        def handle_custom_content(root)
+        def handle_custom_content(repository)
           #if this is the last instance of a custom repo, destroy the content
-          if root.repositories.count == 1
-            plan_action(Product::ContentDestroy, root)
+          if repository.root.repositories.where.not(id: repository.id).empty?
+            plan_action(::Actions::Katello::Product::ContentDestroy, repository.root)
           end
         end
 

data/db/migrate/20141209103005_disown_foreman_templates.rb

@@ -19,11 +19,6 @@ class DisownForemanTemplates < ActiveRecord::Migration[4.2]
 
   def update_templates_attributes(attribute_hash)
     templates = ["puppet.conf", "freeipa_register", "Kickstart default iPXE", "Kickstart default PXELinux", "PXELinux global default"]
-
-    templates.each do |template|
-      if (template = FakeConfigTemplate.find_by(:name => template))
-        template.update_attributes(attribute_hash)
-      end
-    end
+    FakeConfigTemplate.where(name: templates).update_all(attribute_hash)
   end
 end

data/db/migrate/20180814202747_add_recurring_logic_to_sync_plan.rb

@@ -1,6 +1,7 @@
 class AddRecurringLogicToSyncPlan < ActiveRecord::Migration[5.1]
   def change
     add_column :katello_sync_plans, :foreman_tasks_recurring_logic_id, :integer
+    add_column :katello_sync_plans, :cron_expression, :string
     add_foreign_key :katello_sync_plans, :foreman_tasks_recurring_logics, :name => "katello_sync_plan_foreman_tasks_recurring_logic_fk", :column => "foreman_tasks_recurring_logic_id"
     Katello::SyncPlan.find_each do |sync_plan|
       User.as_anonymous_admin do

data/db/migrate/20180821144248_add_cron_logic_to_sync_plans.rb

@@ -1,5 +1,5 @@
 class AddCronLogicToSyncPlans < ActiveRecord::Migration[5.1]
   def change
-    add_column :katello_sync_plans, :cron_expression, :string
+    #Changes moved to migration class: AddRecurringLogicToSyncPlan
   end
 end

data/lib/katello/plugin.rb

@@ -315,6 +315,8 @@ Foreman::Plugin.register :katello do
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles
 
+  add_permissions_to_default_roles 'System admin' => [:create_lifecycle_environments, :create_content_views]
+
   role 'Register hosts', [
     :view_hostgroups, :view_activation_keys, :view_hosts,
     :create_hosts, :edit_hosts, :destroy_hosts,

data/lib/katello/tasks/upgrade_check.rake

@@ -11,7 +11,7 @@ namespace :katello do
     puts "Checking upgradeability...\n\n"
 
     # check for any running tasks
-    task_count = ::ForemanTasks::Task.active.where("label NOT IN (?)", [CP_LISTEN_ACTION, EVENT_QUEUE_ACTION]).count
+    task_count = ::ForemanTasks::Task.active.where("label NOT IN (?)", [CP_LISTEN_ACTION, EVENT_QUEUE_ACTION]).where("state != 'scheduled'").count
     task_status = task_count > 0 ? fail : success
     puts "Checking for running tasks..."
     puts "[#{task_status}] - There are #{task_count} active tasks. "

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.9.0.rc2".freeze
+  VERSION = "3.9.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.9.0.rc2
+  version: 3.9.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2610,9 +2610,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1