foreman_puppet 2.0.2 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6a528bcec7516d10a4b94f455b9ba0eae4ce8ce978d4a242e504d1b73e430b
-  data.tar.gz: 44593d006e0f911a1c43f75ee23cfd949b38ff4766e7cd43c291c528c20a0a97
+  metadata.gz: 4f100007c8385b76f68835195d0ed1390e4096ba73ca576d5c971452769b1402
+  data.tar.gz: 3e2e6e9c84153e7be459a237b430eebd4d03f87ac33ee858bc84923a50ddaa2d
 SHA512:
-  metadata.gz: 6ee6bee3076a1550b35427f9df89361d5d0bf96e205916999f2f0631e69c1d22d2b2afa31d0d511a43b6f3ea8f68ec0a62dda08ff84c35451de9f36cbcf87059
-  data.tar.gz: fa627b81d596bfe7501a335546cf16fcf66c95f7dbd3f3c807bf4c1b99cb8cc3ba3a4688729f2f9a4e2bf2e0b66f749fdba065362e5673f3f940e44bfdb6c403
+  metadata.gz: 509c941bb930c98c91451bb23f298734e7999038e912a1d3bee7664bdf9bb4367509c0097b427330e420209cdffe2a49c3375050c6a76271f6fa131c2cbe4b53
+  data.tar.gz: 93c89dee2564fda4e143161b17c1c43d4afd43b1ee9eb78f24585bed6bfafe4dd401cd0ad91e71eda7899466cd6d89a8d4de0cedb356bd60ebea436a28683772

data/app/helpers/foreman_puppet/environments_helper.rb

@@ -11,7 +11,7 @@ module ForemanPuppet
     def environments_title_actions
       title_actions import_proxy_select(hash_for_import_environments_environments_path.merge(engine: foreman_puppet)),
         button_group(new_link(_('Create Puppet Environment'), { engine: foreman_puppet }, id: 'new_environment')),
-        button_group(help_button)
+        button_group(link_to(_('Help'), { action: 'welcome' }, { class: 'btn btn-default' }))
     end
   end
 end

data/app/helpers/foreman_puppet/puppetclass_lookup_keys_helper.rb

@@ -9,7 +9,7 @@ module ForemanPuppet
     # ------ Host(group) Form Helpers -----
 
     def overridable_puppet_lookup_keys(klass, obj)
-      klass.class_params.override.where(environment_classes: { environment_id: obj.environment_id })
+      klass.class_params.override.where(environment_classes: { environment_id: obj.environment })
     end
 
     def hidden_puppet_lookup_value_fields(lookup_key, lookup_value, disabled)

data/app/views/foreman_puppet/config_groups/index.html.erb

@@ -2,7 +2,9 @@
 <% content_for(:search_bar) { } %>
 <% title _('Config Groups') %>
 
-<% title_actions new_link(_('Create Config Group'), { engine: foreman_puppet }, id: 'new_config_group'), help_button %>
+<% title_actions(
+     new_link(_('Create Config Group'), { engine: foreman_puppet }, id: 'new_config_group'),
+     link_to(_('Help'), { action: 'welcome' }, { class: 'btn btn-default' })) %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">
   <thead>

data/db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb

@@ -0,0 +1,9 @@
+class MigrateHostClassPermission < ActiveRecord::Migration[6.0]
+  def up
+    Permission.where(resource_type: 'HostClass').update_all(resource_type: 'ForemanPuppet::HostClass')
+  end
+
+  def down
+    # no can do
+  end
+end

data/db/migrate/20220208135305_migrate_environment_ignore_type.foreman_puppet.rb

@@ -0,0 +1,15 @@
+class MigrateEnvironmentIgnoreType < ActiveRecord::Migration[6.0]
+  def up
+    taxonomies = Taxonomy.unscoped.where("ignore_types LIKE '%Environment%'")
+    environment_ids = ForemanPuppet::Environment.unscoped.pluck(:id)
+
+    taxonomies.each do |tax|
+      new_types = tax.ignore_types.reject { |type| type == 'Environment' }
+      tax.update_columns(ignore_types: new_types)
+      taxable_rows = environment_ids.map do |env_id|
+        { taxable_id: env_id, taxable_type: 'ForemanPuppet::Environment', taxonomy_id: tax.id }
+      end
+      TaxableTaxonomy.insert_all(taxable_rows) if taxable_rows.any?
+    end
+  end
+end

data/db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb

@@ -1,6 +1,8 @@
 class CreateHostgroupsPuppetclasses < ActiveRecord::Migration[6.0]
   def up
-    create_table :hostgroups_puppetclasses, id: false, if_not_exists: true do |t|
+    # this table is later renamed into hostgroup_classes and thus we don't want to create it if it exists under the later name
+    return if table_exists?(:hostgroups_puppetclasses) || table_exists?(:hostgroup_classes)
+    create_table :hostgroups_puppetclasses, id: false do |t|
       t.references :hostgroup, foreign_key: true, null: false
       t.references :puppetclass, foreign_key: true, null: false
     end

data/lib/foreman_puppet/register.rb

@@ -147,7 +147,8 @@ Foreman::Plugin.register :foreman_puppet do
     permission :import_puppetclasses, { 'foreman_puppet/puppetclasses' => %i[import_environments obsolete_and_new],
                                         'foreman_puppet/api/v2/environments' => [:import_puppetclasses] },
       resource_type: 'ForemanPuppet::Puppetclass'
-    permission :edit_classes, { 'foreman_puppet/api/v2/host_classes': %i[index create destroy] },
+    permission :edit_classes, { :host_editing => [:edit_classes],
+                                'foreman_puppet/api/v2/host_classes' => %i[index create destroy] },
       resource_type: 'ForemanPuppet::HostClass'
   end
 

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.5'.freeze
 end