foreman_puppet 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f100007c8385b76f68835195d0ed1390e4096ba73ca576d5c971452769b1402
-  data.tar.gz: 3e2e6e9c84153e7be459a237b430eebd4d03f87ac33ee858bc84923a50ddaa2d
+  metadata.gz: a7bf1557e2f3b85bf10044a3ff1a2366165f972aed78e57f9db78dde01fab51f
+  data.tar.gz: 3720fe1afb010d77b4ae0ad6b2ef698542f719d9291494d48b61ddf5b4714977
 SHA512:
-  metadata.gz: 509c941bb930c98c91451bb23f298734e7999038e912a1d3bee7664bdf9bb4367509c0097b427330e420209cdffe2a49c3375050c6a76271f6fa131c2cbe4b53
-  data.tar.gz: 93c89dee2564fda4e143161b17c1c43d4afd43b1ee9eb78f24585bed6bfafe4dd401cd0ad91e71eda7899466cd6d89a8d4de0cedb356bd60ebea436a28683772
+  metadata.gz: 10032e45dd8dc659c4fa0ad0d1140621f2b7d0a7b1f1a312bc3de67f54e831a0610b45118e45ee6bbdf062e21cb87fa002a14942452bbfead76528d5a1b51cdf
+  data.tar.gz: 525397226abe1564b3819585daba6e7011d8c4881ac8ba447becbf096f1493e60f645055439d49ddd640cbe125a5bcc13f1eed975fd3ccb2ef4d9a44c689fc90

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

@@ -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 = '2.0.5'.freeze
+  VERSION = '2.0.6'.freeze
 end