foreman_puppet 3.0.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c2355783d6696a0c201214e7447b649e387f82e1585a349b1eeb3e13b7717b
-  data.tar.gz: 6dcd3c36bc6ffbcf8249f0916c1e96c8d9ce0fed6d6fe4bd933bea22487fef60
+  metadata.gz: 7761d1dddaf8e696fe6b367953ec5618ae906d369b56fe5b75dbfacb56c46b63
+  data.tar.gz: 0ec6e1ba0db133d84b23b64d69b776671edf68ce26fff816d1b733e8e6ca685b
 SHA512:
-  metadata.gz: d8b9474051ad593d3492e3f987cb07d379901b9df21f8e2034ff0965a275cb86375f5dff6d7b427428387a7f83596e59cfc9a847cb3a7b3af3acff8bc67540c6
-  data.tar.gz: 96957f843bcd42ce54dee222fcfc00b4abfa0fda1ea12ec73e7bf44bbcbe0b9dbfb820585743e05335b226d71fed431a4522251582629cf5bc538ef493a29277
+  metadata.gz: 7114fbf6e9bd9743e7a5a61ccd1e5a83461e9ccbeb69b03173197be66cbca67a7269c108939c7d6b37624bee0bff21ea68d4a7126f7c9f706cee9be59dc4fdb7
+  data.tar.gz: 6e66ddc14019c5c92c1ec53dd9fe00565e739ed0b61bc425c589594ce1542a3ad47d41b430b37957a4de995583e1bcbdc04c5191ac54b7da5452bb63f9ddc731

data/app/views/hosts/foreman_puppet/_form_list_env_field_content.html.erb

@@ -0,0 +1 @@
+<td class="hidden-xs ellipsis"><%= host.environment %></td>

data/app/views/hosts/foreman_puppet/_form_list_env_field_header.html.erb

@@ -0,0 +1 @@
+<th class="hidden-xs" width="10%"><%= sort :environment, :as => _("Puppet Environment") %></th>

data/db/migrate/20220421204325_drop_environment_from_host_and_hg.foreman_puppet.rb

@@ -0,0 +1,8 @@
+class DropEnvironmentFromHostAndHg < ActiveRecord::Migration[6.0]
+  def up
+    remove_column(:hostgroups, :environment_id) if column_exists?(:hostgroups, :environment_id)
+    remove_column(:hosts, :environment_id) if column_exists?(:hosts, :environment_id)
+  end
+
+  # This is just to clean up core, we do not want to add the columns again on uninstall
+end

data/lib/foreman_puppet/register.rb

@@ -1,7 +1,7 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 3.0.0'
+  requires_foreman '>= 3.3.0'
   # Add Global JS file for extending foreman-core components and routes
-  register_global_js_file 'fills'
+  register_global_js_file 'global'
 
   settings do
     category(:facts, N_('Facts')) do
@@ -153,7 +153,6 @@ Foreman::Plugin.register :foreman_puppet do
   end
 
   add_all_permissions_to_default_roles
-  Foreman::Plugin::RbacSupport::AUTO_EXTENDED_ROLES |= ['Site manager']
   add_permissions_to_default_roles(
     'Site manager' => %w[view_puppetclasses import_puppetclasses view_environments import_environments
                          view_external_parameters create_external_parameters edit_external_parameters destroy_external_parameters]
@@ -225,4 +224,8 @@ Foreman::Plugin.register :foreman_puppet do
         priority: 100
     end
   end
+  extend_page 'hosts/_list' do |cx|
+    cx.add_pagelet :hosts_table_column_header, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_header', priority: 100
+    cx.add_pagelet :hosts_table_column_content, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_content', priority: 100
+  end
 end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '3.0.4'.freeze
+  VERSION = '4.0.0'.freeze
 end