foreman_puppet 7.0.0 → 8.1.0

data/app/models/concerns/foreman_puppet/extensions/host.rb

@@ -24,10 +24,9 @@ module ForemanPuppet
           conditions = sanitize_sql_for_conditions(["puppetclasses.name #{operator} ?", value_to_sql(operator, value)])
           config_group_ids = ForemanPuppet::ConfigGroup.joins(:puppetclasses).where(conditions).pluck(:id)
           host_ids         = ::Host.authorized(:view_hosts).joins(puppet: :puppetclasses).where(conditions).distinct.pluck(:id)
-          host_ids        += ForemanPuppet::HostConfigGroup
-                             .where(host_type: 'ForemanPuppet::HostPuppetFacet')
-                             .where(config_group_id: config_group_ids)
-                             .pluck(:host_id)
+          host_ids        += ForemanPuppet::HostPuppetFacet.joins(:host_config_groups)
+                                                           .where(host_config_groups: { config_group_id: config_group_ids })
+                                                           .pluck(:host_id)
           hostgroup_ids = ::Hostgroup.unscoped.with_taxonomy_scope.joins(puppet: :puppetclasses).where(conditions).map(&:subtree_ids)
           if config_group_ids.any?
             hostgroup_cg_ids = ForemanPuppet::HostgroupPuppetFacet.joins(:host_config_groups)

data/app/models/concerns/foreman_puppet/extensions/provisioning_template.rb

@@ -6,6 +6,7 @@ module ForemanPuppet
       included do
         has_many :environments, through: :template_combinations
         before_destroy EnsureNotUsedBy.new(:environments)
+        before_save :remove_snippet_associations
 
         scoped_search relation: :environments, on: :name, rename: :environment, complete_value: true
 
@@ -54,9 +55,9 @@ module ForemanPuppet
         end
 
         # check if our template is a snippet, and remove its associations just in case they were selected.
-        def check_for_snippet_assoications
-          super
+        def remove_snippet_associations
           return unless snippet
+
           environments.clear
         end
       end

data/lib/foreman_puppet/engine.rb

@@ -6,8 +6,10 @@ module ForemanPuppet
     config.paths['db/migrate'] << 'db/migrate_foreman' if Gem::Dependency.new('', ">= #{ForemanPuppet::FOREMAN_DROP_MIGRATIONS_VERSION}").match?('', SETTINGS[:version].notag)
     config.paths['config/routes.rb'].unshift('config/api_routes.rb')
 
-    initializer 'foreman_puppet.register_plugin', before: :finisher_hook do |_app|
-      require 'foreman_puppet/register'
+    initializer 'foreman_puppet.register_plugin', before: :finisher_hook do |app|
+      app.reloader.to_prepare do
+        require_relative 'register'
+      end
       Apipie.configuration.checksum_path += ['/foreman_puppet/api/']
     end
 
@@ -23,14 +25,10 @@ module ForemanPuppet
       SETTINGS[:foreman_puppet] = { assets: { precompile: ['foreman_puppet.scss'] } }
     end
 
-    initializer 'foreman_puppet.patch_parameters' do
-      # Parameters should go ASAP as they need to be applied before they are included in core controller
-      Foreman::Controller::Parameters::TemplateCombination.include ForemanPuppet::Extensions::ParametersTemplateCombination
-    end
-
     # Include concerns in this config.to_prepare block
     # rubocop:disable Metrics/BlockLength
     config.to_prepare do
+      Foreman::Controller::Parameters::TemplateCombination.include ForemanPuppet::Extensions::ParametersTemplateCombination
       # Facets extenstion is applied too early - before the Hostgroup is complete
       # We redefine thing, so we need to wait until complete definition of Hostgroup
       # thus separate patching instead of using facet patching

data/lib/foreman_puppet/register.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 3.7'
+  requires_foreman '>= 3.13'
   register_gettext
 
   # Add Global JS file for extending foreman-core components and routes

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '7.0.0'.freeze
+  VERSION = '8.1.0'.freeze
 end

data/locale/Makefile

@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-%.edit.po:
+%.edit.po: %.po.time_stamp
 	touch $@
 
+# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
+%.po.time_stamp: %.po
+	touch --reference $< $@
+
+# Prevent make from treating this as an intermediate file to be cleaned up
+.PRECIOUS: %.po.time_stamp
+
 check: $(POXFILES)
 
 # Unify duplicate translations
@@ -43,7 +50,10 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	cd .. && tx pull -f --all
+	# Initialize new languages
+	cd .. && tx pull -f --all --minimum-perc 50
+	# Force update all existing languages
+	cd .. && tx pull -f --minimum-perc 0
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done

data/locale/ca/foreman_puppet.po

@@ -4,15 +4,15 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2022
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2023
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 5.0.0\n"
+"Project-Id-Version: foreman_puppet 8.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2022\n"
-"Language-Team: Catalan (https://www.transifex.com/foreman/teams/114/ca/)\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2023\n"
+"Language-Team: Catalan (https://app.transifex.com/foreman/teams/114/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,9 +55,6 @@ msgstr ""
 msgid "A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step."
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr ""
-
 msgid "Actions"
 msgstr "Accions"
 
@@ -388,18 +385,12 @@ msgstr ""
 msgid "Import"
 msgstr "Importa"
 
-msgid "Import Puppet classes"
-msgstr ""
-
 msgid "Import classes from %s"
 msgstr ""
 
 msgid "Import environments from %s"
 msgstr ""
 
-msgid "Import facts"
-msgstr ""
-
 msgid "Import puppet classes from puppet proxy"
 msgstr ""
 
@@ -641,7 +632,7 @@ msgid "Puppet YAML"
 msgstr ""
 
 msgid "Puppet classes"
-msgstr ""
+msgstr "Classes de Puppet"
 
 msgid "Puppet details"
 msgstr ""
@@ -670,9 +661,6 @@ msgstr "Paràmetre de Puppet"
 msgid "Puppetclass|Name"
 msgstr "Nom"
 
-msgid "Remote action:"
-msgstr ""
-
 msgid "Remove"
 msgstr "Suprimeix"
 

data/locale/cs_CZ/foreman_puppet.po

@@ -7,15 +7,15 @@
 # Ondřej Ezr <ezrik12@gmail.com>, 2021
 # Lukáš Zapletal, 2021
 # mhulan <mhulan@redhat.com>, 2022
-# Pavel Borecki <pavel.borecki@gmail.com>, 2022
+# Pavel Borecki <pavel.borecki@gmail.com>, 2023
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 5.0.0\n"
+"Project-Id-Version: foreman_puppet 8.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
-"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2022\n"
-"Language-Team: Czech (Czech Republic) (https://www.transifex.com/foreman/teams"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2023\n"
+"Language-Team: Czech (Czech Republic) (https://app.transifex.com/foreman/teams"
 "/114/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,9 +60,6 @@ msgstr ""
 msgid "A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step."
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr "Akce s dílčími plány"
-
 msgid "Actions"
 msgstr "Akce"
 
@@ -154,7 +151,7 @@ msgid "Config Management"
 msgstr "Správa nastavení"
 
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Zkopírovat do schránky"
 
 msgid "Corrective Change"
 msgstr ""
@@ -393,18 +390,12 @@ msgstr "Ignorováno:"
 msgid "Import"
 msgstr "Import"
 
-msgid "Import Puppet classes"
-msgstr "Importovat Puppet třídy"
-
 msgid "Import classes from %s"
 msgstr "Importovat třídy z %s"
 
 msgid "Import environments from %s"
 msgstr ""
 
-msgid "Import facts"
-msgstr "Importovat fakta"
-
 msgid "Import puppet classes from puppet proxy"
 msgstr "Importovat puppet třídy z puppet proxy"
 
@@ -675,9 +666,6 @@ msgstr "Puppet parametr"
 msgid "Puppetclass|Name"
 msgstr "Puppetclass|Název"
 
-msgid "Remote action:"
-msgstr "Akce na protějšku:"
-
 msgid "Remove"
 msgstr "Odebrat"
 

data/locale/de/foreman_puppet.po

@@ -11,25 +11,25 @@
 # Wiederoder <stefanwiederoder@googlemail.com>, 2021
 # 47388d0d0847859fcc07f8955b27d2a7_d1cb104 <93875580def0fcc1a566b016c3948752_122921>, 2021
 # Arnold Bechtoldt <mail@arnoldbechtoldt.com>, 2021
-# simon11 <transifex@stieger.co>, 2021
 # Ettore Atalan <atalanttore@googlemail.com>, 2021
+# 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
 # stbenjam <stephen@redhat.com>, 2021
 # Christina Gurski <Gurski_christina@yahoo.de>, 2021
-# Crited <Alexander.Stoll@netways.de>, 2021
 # Mathias Reichardt, 2022
 # Martin Zimmermann <martin.zimmermann@gmx.com>, 2022
 # Bryan Kearney <bryan.kearney@gmail.com>, 2022
-# Patrick Dolinic, 2022
 # abf90805572190d649c59f7a021d76cb, 2022
-# 0868a4d1af5275b3f70b0a6dac4c99a4, 2022
+# simon11 <transifex@stieger.co>, 2023
+# Crited <Alexander.Stoll@netways.de>, 2023
+# pdolinic, 2024
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 5.0.0\n"
+"Project-Id-Version: foreman_puppet 8.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
-"Last-Translator: 0868a4d1af5275b3f70b0a6dac4c99a4, 2022\n"
-"Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\n"
+"Last-Translator: pdolinic, 2024\n"
+"Language-Team: German (https://app.transifex.com/foreman/teams/114/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,9 +76,6 @@ msgstr ""
 msgid "A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step."
 msgstr "Eine Konfigurationsgruppe bietet eine Methode, mit der viele Puppet Klassen einem Host oder einer Hostgruppe zugewiesen werden können. Dadurch kann man typischerweise ein bestimmtes Applikationsprofil oder Stack in einem Schritt zuweisen."
 
-msgid "Action with sub plans"
-msgstr "Aktion mit Unterplänen"
-
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -170,7 +167,7 @@ msgid "Config Management"
 msgstr "Konfigurationsmanagement"
 
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "In Zwischenablage abspeichern"
 
 msgid "Corrective Change"
 msgstr ""
@@ -409,18 +406,12 @@ msgstr "Ignoriert:"
 msgid "Import"
 msgstr "Import"
 
-msgid "Import Puppet classes"
-msgstr "Puppet-Klassen importieren"
-
 msgid "Import classes from %s"
 msgstr "Importiere Klassen von %s"
 
 msgid "Import environments from %s"
 msgstr "Importiere Umgebung von %s"
 
-msgid "Import facts"
-msgstr "Fakten importieren"
-
 msgid "Import puppet classes from puppet proxy"
 msgstr "Puppet-Klassen vom Puppet-Proxy importieren"
 
@@ -521,7 +512,7 @@ msgid "Name"
 msgstr "Name"
 
 msgid "Never"
-msgstr ""
+msgstr "Niemals"
 
 msgid "New"
 msgstr "Neu"
@@ -662,7 +653,7 @@ msgid "Puppet YAML"
 msgstr "Puppet YAML"
 
 msgid "Puppet classes"
-msgstr ""
+msgstr "Puppet-Klassen"
 
 msgid "Puppet details"
 msgstr ""
@@ -691,9 +682,6 @@ msgstr "Puppet-Parameter"
 msgid "Puppetclass|Name"
 msgstr "Name"
 
-msgid "Remote action:"
-msgstr "Entfernte Aktion:"
-
 msgid "Remove"
 msgstr "Entfernen"
 

data/locale/en/foreman_puppet.po

@@ -1,19 +1,21 @@
-# foreman_puppet
-#
-# This file is distributed under the same license as foreman_puppet.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_puppet package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 5.0.0\n"
+"Project-Id-Version: foreman_puppet 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-20 08:54+0100\n"
-"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
-"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"PO-Revision-Date: 2024-09-19 13:06+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 msgid " Remove"
 msgstr ""
@@ -51,9 +53,6 @@ msgstr ""
 msgid "A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step."
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr ""
-
 msgid "Actions"
 msgstr ""
 
@@ -384,18 +383,12 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr ""
-
 msgid "Import classes from %s"
 msgstr ""
 
 msgid "Import environments from %s"
 msgstr ""
 
-msgid "Import facts"
-msgstr ""
-
 msgid "Import puppet classes from puppet proxy"
 msgstr ""
 
@@ -666,9 +659,6 @@ msgstr ""
 msgid "Puppetclass|Name"
 msgstr ""
 
-msgid "Remote action:"
-msgstr ""
-
 msgid "Remove"
 msgstr ""
 

data/locale/en_GB/foreman_puppet.po

@@ -5,15 +5,15 @@
 #
 # Translators:
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
-# Andi Chandler <andi@gowling.com>, 2022
+# Andi Chandler <andi@gowling.com>, 2024
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 5.0.0\n"
+"Project-Id-Version: foreman_puppet 8.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>, 2022\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/foreman/tea"
+"Last-Translator: Andi Chandler <andi@gowling.com>, 2024\n"
+"Language-Team: English (United Kingdom) (https://app.transifex.com/foreman/tea"
 "ms/114/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,9 +57,6 @@ msgstr ""
 msgid "A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step."
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr "Action with sub plans"
-
 msgid "Actions"
 msgstr "Actions"
 
@@ -112,7 +109,7 @@ msgid "Change Puppet Master"
 msgstr ""
 
 msgid "Changed"
-msgstr ""
+msgstr "Changed"
 
 msgid "Changed environments"
 msgstr ""
@@ -253,7 +250,7 @@ msgid "Empty environment"
 msgstr ""
 
 msgid "Environment"
-msgstr ""
+msgstr "Environment"
 
 msgid "Environment only"
 msgstr ""
@@ -268,7 +265,7 @@ msgid "Error!"
 msgstr ""
 
 msgid "Facts"
-msgstr ""
+msgstr "Facts"
 
 msgid "Failed"
 msgstr ""
@@ -390,18 +387,12 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr "Import Puppet classes"
-
 msgid "Import classes from %s"
 msgstr ""
 
 msgid "Import environments from %s"
 msgstr ""
 
-msgid "Import facts"
-msgstr "Import facts"
-
 msgid "Import puppet classes from puppet proxy"
 msgstr ""
 
@@ -672,9 +663,6 @@ msgstr ""
 msgid "Puppetclass|Name"
 msgstr "Class name"
 
-msgid "Remote action:"
-msgstr "Remote action:"
-
 msgid "Remove"
 msgstr ""