foreman_templates 9.4.0 → 9.5.0

data/app/assets/javascripts/foreman_templates/locale/zh_TW/foreman_templates.js

@@ -17,194 +17,191 @@
         "domain": "foreman_templates",
         "plural_forms": "nplurals=1; plural=0;"
       },
-      "Branch in Git repo.": [
+      "Action type": [
         ""
       ],
-      "Override the default repo from settings.": [
+      "Always": [
         ""
       ],
-      "Export templates with names matching this regex (case-insensitive; snippets are not filtered).": [
+      "Associate": [
         ""
       ],
-      "Negate the prefix (for purging).": [
+      "Associate templates to OS, organization and location": [
         ""
       ],
-      "The directory within Git repo containing the templates": [
+      "Associate to OS's, Locations & Organizations. Options are: always, new or never.": [
         ""
       ],
-      "Initiate Import": [
+      "Back to sync form": [
         ""
       ],
-      "The string all imported templates should begin with.": [
+      "Branch": [
         ""
       ],
-      "Associate to OS's, Locations & Organizations. Options are: always, new or never.": [
+      "Branch in Git repo.": [
         ""
       ],
-      "Update templates that are locked": [
+      "Choose verbosity for Rake task importing templates": [
         ""
       ],
-      "Lock imported templates": [
+      "Commit message": [
         ""
       ],
-      "Show template diff in response": [
+      "Custom commit message for templates export": [
         ""
       ],
-      "Initiate Export": [
+      "Default branch in Git repo": [
         ""
       ],
-      "Specify how to handle metadata": [
+      "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata": [
         ""
       ],
-      "Custom commit message for templates export": [
+      "Dirname": [
         ""
       ],
-      "Using file-based synchronization, but couldn't access %s. ": [
+      "Export": [
         ""
       ],
-      "Please check the access permissions/SELinux and make sure it is readable/writable for the web application user account, typically '%s'.": [
+      "Export templates with names matching this regex (case-insensitive; snippets are not filtered).": [
         ""
       ],
-      "Always": [
-        ""
+      "Filter": [
+        "篩選器"
       ],
-      "New": [
-        "新增"
+      "Force import": [
+        ""
       ],
-      "Never": [
-        "永不"
+      "How to handle lock for imported templates?": [
+        ""
       ],
-      "Lock": [
-        "鎖定"
+      "Import": [
+        ""
       ],
-      "Keep, lock new": [
+      "Import or Export Templates": [
         ""
       ],
-      "Keep, do not lock new": [
+      "Import/export names matching this regex (case-insensitive; snippets are not filtered)": [
         ""
       ],
-      "Unlock": [
-        "解鎖"
+      "Initiate Export": [
+        ""
       ],
-      "Refresh": [
-        "重新整理"
+      "Initiate Import": [
+        ""
       ],
       "Keep": [
         ""
       ],
-      "Remove": [
-        "移除"
+      "Keep, do not lock new": [
+        ""
       ],
-      "Template Sync": [
+      "Keep, lock new": [
         ""
       ],
-      "Choose verbosity for Rake task importing templates": [
+      "Lock": [
+        "鎖定"
+      ],
+      "Lock imported templates": [
         ""
       ],
-      "Verbosity": [
+      "Lock templates": [
         ""
       ],
-      "Associate templates to OS, organization and location": [
+      "Metadata export mode": [
         ""
       ],
-      "Associate": [
+      "Negate": [
         ""
       ],
-      "The string that will be added as prefix to imported templates": [
+      "Negate the filter for import/export": [
         ""
       ],
-      "Prefix": [
+      "Negate the prefix (for purging).": [
         ""
       ],
-      "The directory within the Git repo containing the templates": [
+      "Never": [
+        "永不"
+      ],
+      "New": [
+        "新增"
+      ],
+      "Override the default repo from settings.": [
         ""
       ],
-      "Dirname": [
+      "Page Not Found": [
         ""
       ],
-      "Import/export names matching this regex (case-insensitive; snippets are not filtered)": [
+      "Permission Denied": [
         ""
       ],
-      "Filter": [
-        "篩選器"
+      "Please check the access permissions/SELinux and make sure it is readable/writable for the web application user account, typically '%s'.": [
+        ""
       ],
-      "Target path to import/export. Different protocols can be used, for example /tmp/dir, git://example.com, https://example.com, ssh://example.com. When exporting to /tmp, note that production deployments may be configured to use private tmp.": [
+      "Please request one of the required permissions listed below from a Foreman administrator:": [
+        "請從 Foreman 管理者處，要求下列所需權限之一："
+      ],
+      "Prefix": [
         ""
       ],
+      "Refresh": [
+        "重新整理"
+      ],
+      "Remove": [
+        "移除"
+      ],
       "Repo": [
         "軟體庫"
       ],
-      "Negate the filter for import/export": [
+      "Should importing overwrite locked templates?": [
         ""
       ],
-      "Negate": [
+      "Show template diff in response": [
         ""
       ],
-      "Default branch in Git repo": [
+      "Specify how to handle metadata": [
         ""
       ],
-      "Branch": [
+      "Sync Templates": [
         ""
       ],
-      "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata": [
+      "Target path to import/export. Different protocols can be used, for example /tmp/dir, git://example.com, https://example.com, ssh://example.com. When exporting to /tmp, note that production deployments may be configured to use private tmp.": [
         ""
       ],
-      "Metadata export mode": [
+      "Template Sync": [
         ""
       ],
-      "Should importing overwrite locked templates?": [
+      "The directory within Git repo containing the templates": [
         ""
       ],
-      "Force import": [
+      "The directory within the Git repo containing the templates": [
         ""
       ],
-      "How to handle lock for imported templates?": [
+      "The page you are looking for does not exist": [
         ""
       ],
-      "Lock templates": [
+      "The string all imported templates should begin with.": [
         ""
       ],
-      "Commit message": [
+      "The string that will be added as prefix to imported templates": [
         ""
       ],
-      "Sync Templates": [
-        ""
+      "Unlock": [
+        "解鎖"
       ],
-      "Import or Export Templates": [
+      "Update templates that are locked": [
         ""
       ],
       "Use default value from settings": [
         ""
       ],
-      "Page Not Found": [
+      "Using file-based synchronization, but couldn't access %s. ": [
         ""
       ],
-      "The page you are looking for does not exist": [
+      "Verbosity": [
         ""
       ],
       "You are not authorized to perform this action.": [
         "您未經許可執行這項動作。"
-      ],
-      "Please request one of the required permissions listed below from a Foreman administrator:": [
-        "請從 Foreman 管理者處，要求下列所需權限之一："
-      ],
-      "Permission Denied": [
-        ""
-      ],
-      "Back to sync form": [
-        ""
-      ],
-      "Remote action:": [
-        "遠端動作："
-      ],
-      "Import facts": [
-        "匯入詳情"
-      ],
-      "Action with sub plans": [
-        "有子計畫的動作"
-      ],
-      "Import Puppet classes": [
-        "匯入 Puppet 類別"
       ]
     }
   }

data/app/models/concerns/foreman_templates/template_extensions.rb

@@ -5,7 +5,7 @@ module ForemanTemplates
     extend ActiveSupport::Concern
 
     def template_file
-      Shellwords.escape(name.downcase.tr(' /', '_') + '.erb')
+      Shellwords.escape("#{name.downcase.tr(' /', '_')}.erb")
     end
   end
 end

data/app/services/foreman_templates/parse_result.rb

@@ -15,7 +15,7 @@ module ForemanTemplates
         :imported => @imported,
         :additional_errors => @additional_errors,
         :additional_info => @additional_info,
-        :exception => @exception ? @exception.message : nil,
+        :exception => @exception&.message,
         :validation_errors => errors.to_h,
         :file => @template_file,
         :type => @template.present? ? @template.class.name.underscore : nil
@@ -27,7 +27,7 @@ module ForemanTemplates
     end
 
     def errors
-      @template ? @template.errors : nil
+      @template&.errors
     end
 
     def corrupted_metadata

data/app/services/foreman_templates/template_exporter.rb

@@ -168,8 +168,10 @@ module ForemanTemplates
     end
 
     def templates_query(tax_ids)
-      Template.where(:id => TaxableTaxonomy.where(:taxonomy_id => tax_ids,
-                                                  :taxable_type => Template.subclasses.map(&:name)).pluck(:taxable_id))
+      Template.where(:id => TaxableTaxonomy.where(
+        :taxonomy_id => tax_ids,
+        :taxable_type => Template.subclasses.map(&:name)
+      ).pluck(:taxable_id))
     end
 
     def taxes_ids(tax_type)

data/app/services/foreman_templates/template_importer.rb

@@ -47,7 +47,7 @@ module ForemanTemplates
 
     def parse_files!
       Dir["#{@dir}/#{@dirname}/**/*.erb"].each do |template_file|
-        logger.debug 'Parsing: ' + template_file.gsub(%r{#{@dir}\/#{@dirname}}, '')
+        logger.debug "Parsing: #{template_file.gsub(%r{#{@dir}/#{@dirname}}, '')}"
         parse_result = ParseResult.new(template_file)
 
         text = File.read(template_file)
@@ -164,7 +164,7 @@ module ForemanTemplates
 
     def purge!
       clause = "name #{@negate ? 'NOT ' : ''}LIKE ?"
-      ProvisioningTemplate.where(clause, "#{@prefix}%").each do |template|
+      ProvisioningTemplate.where(clause, "#{@prefix}%").find_each do |template|
         puts template if @verbose
         template.destroy
       end

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = "9.4.0".freeze
+  VERSION = "9.5.0".freeze
 end

data/locale/cs_CZ/foreman_templates.po

@@ -21,8 +21,8 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= "
 "4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-msgid "Action with sub plans"
-msgstr "Akce s dílčími plány"
+msgid "Action type"
+msgstr ""
 
 msgid "Always"
 msgstr "Vždy"
@@ -63,6 +63,9 @@ msgstr ""
 msgid "Dirname"
 msgstr ""
 
+msgid "Export"
+msgstr ""
+
 msgid "Export templates with names matching this regex (case-insensitive; snippets are not filtered)."
 msgstr ""
 
@@ -75,11 +78,8 @@ msgstr "Vynutit import"
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr "Importovat Puppet třídy"
-
-msgid "Import facts"
-msgstr "Importovat fakta"
+msgid "Import"
+msgstr ""
 
 msgid "Import or Export Templates"
 msgstr ""
@@ -150,9 +150,6 @@ msgstr "Předpona"
 msgid "Refresh"
 msgstr "Načíst znovu"
 
-msgid "Remote action:"
-msgstr "Akce na protějšku:"
-
 msgid "Remove"
 msgstr "Odebrat"
 

data/locale/de/foreman_templates.po

@@ -25,8 +25,8 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Action with sub plans"
-msgstr "Aktion mit Unterplänen"
+msgid "Action type"
+msgstr ""
 
 msgid "Always"
 msgstr "Immer"
@@ -67,6 +67,9 @@ msgstr "Standard-Metadaten-Exportmodus, Aktualisieren, rendert Metadaten neu, be
 msgid "Dirname"
 msgstr "Dirname"
 
+msgid "Export"
+msgstr ""
+
 msgid "Export templates with names matching this regex (case-insensitive; snippets are not filtered)."
 msgstr "Exportieren Sie Vorlagen mit Namen, die dieser Regex entsprechen (Groß-/Kleinschreibung wird nicht beachtet; Snippets werden nicht gefiltert)."
 
@@ -79,11 +82,8 @@ msgstr "Import erzwingen"
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr "Puppet-Klassen importieren"
-
-msgid "Import facts"
-msgstr "Fakten importieren"
+msgid "Import"
+msgstr ""
 
 msgid "Import or Export Templates"
 msgstr ""
@@ -154,9 +154,6 @@ msgstr "Präfix"
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-msgid "Remote action:"
-msgstr "Entfernte Aktion:"
-
 msgid "Remove"
 msgstr "Entfernen"
 

data/locale/en_GB/foreman_templates.po

@@ -21,8 +21,8 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Action with sub plans"
-msgstr "Action with sub plans"
+msgid "Action type"
+msgstr ""
 
 msgid "Always"
 msgstr ""
@@ -63,6 +63,9 @@ msgstr ""
 msgid "Dirname"
 msgstr ""
 
+msgid "Export"
+msgstr ""
+
 msgid "Export templates with names matching this regex (case-insensitive; snippets are not filtered)."
 msgstr ""
 
@@ -75,11 +78,8 @@ msgstr ""
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr "Import Puppet classes"
-
-msgid "Import facts"
-msgstr "Import facts"
+msgid "Import"
+msgstr ""
 
 msgid "Import or Export Templates"
 msgstr ""
@@ -150,9 +150,6 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-msgid "Remote action:"
-msgstr "Remote action:"
-
 msgid "Remove"
 msgstr ""
 

data/locale/es/foreman_templates.po

@@ -21,8 +21,8 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
 " 2;\n"
 
-msgid "Action with sub plans"
-msgstr "Ação com subplanos "
+msgid "Action type"
+msgstr ""
 
 msgid "Always"
 msgstr "Sempre"
@@ -63,6 +63,9 @@ msgstr "Modo de exportação de metadados padrão, atualiza os metadados de reve
 msgid "Dirname"
 msgstr "Dirname"
 
+msgid "Export"
+msgstr ""
+
 msgid "Export templates with names matching this regex (case-insensitive; snippets are not filtered)."
 msgstr "Modelos de exportação com nomes correspondentes a este regex (não sensível a maiúsculas e minúsculas; os trechos não são filtrados)."
 
@@ -75,11 +78,8 @@ msgstr "Forçar a importação"
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr "Importar classes de Puppet"
-
-msgid "Import facts"
-msgstr "Importar fatos"
+msgid "Import"
+msgstr ""
 
 msgid "Import or Export Templates"
 msgstr ""
@@ -150,9 +150,6 @@ msgstr "Prefixo"
 msgid "Refresh"
 msgstr "Atualizar"
 
-msgid "Remote action:"
-msgstr "Ação remota:"
-
 msgid "Remove"
 msgstr "Remover"
 

data/locale/fr/foreman_templates.po

@@ -24,8 +24,8 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 100000"
 "0 == 0 ? 1 : 2;\n"
 
-msgid "Action with sub plans"
-msgstr "Action avec sous-plans"
+msgid "Action type"
+msgstr ""
 
 msgid "Always"
 msgstr "Toujours"
@@ -66,6 +66,9 @@ msgstr "Mode d'exportation des métadonnées par défaut, rafraîchir restitue l
 msgid "Dirname"
 msgstr "Dirname"
 
+msgid "Export"
+msgstr ""
+
 msgid "Export templates with names matching this regex (case-insensitive; snippets are not filtered)."
 msgstr "Exporte les modèles dont les noms correspondent à cette expression rationnelle (insensible à la casse ; les extraits ne sont pas filtrés)."
 
@@ -78,11 +81,8 @@ msgstr "Forcer l'importation"
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr "Importer des classes Puppet"
-
-msgid "Import facts"
-msgstr "Importer des faits"
+msgid "Import"
+msgstr ""
 
 msgid "Import or Export Templates"
 msgstr ""
@@ -153,9 +153,6 @@ msgstr "Préfixe"
 msgid "Refresh"
 msgstr "Réactualiser"
 
-msgid "Remote action:"
-msgstr "Action distante :"
-
 msgid "Remove"
 msgstr "Supprimer"
 

data/locale/gl/foreman_templates.po

@@ -19,7 +19,7 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Action with sub plans"
+msgid "Action type"
 msgstr ""
 
 msgid "Always"
@@ -61,6 +61,9 @@ msgstr ""
 msgid "Dirname"
 msgstr ""
 
+msgid "Export"
+msgstr ""
+
 msgid "Export templates with names matching this regex (case-insensitive; snippets are not filtered)."
 msgstr ""
 
@@ -73,10 +76,7 @@ msgstr ""
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr ""
-
-msgid "Import facts"
+msgid "Import"
 msgstr ""
 
 msgid "Import or Export Templates"
@@ -148,9 +148,6 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-msgid "Remote action:"
-msgstr ""
-
 msgid "Remove"
 msgstr ""
 

data/locale/it/foreman_templates.po

@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
 " 2;\n"
 
-msgid "Action with sub plans"
+msgid "Action type"
 msgstr ""
 
 msgid "Always"
@@ -64,6 +64,9 @@ msgstr ""
 msgid "Dirname"
 msgstr ""
 
+msgid "Export"
+msgstr ""
+
 msgid "Export templates with names matching this regex (case-insensitive; snippets are not filtered)."
 msgstr ""
 
@@ -76,11 +79,8 @@ msgstr ""
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr "Importa classi Puppet"
-
-msgid "Import facts"
-msgstr "Importa gli eventi"
+msgid "Import"
+msgstr ""
 
 msgid "Import or Export Templates"
 msgstr ""
@@ -151,9 +151,6 @@ msgstr ""
 msgid "Refresh"
 msgstr "Aggiorna"
 
-msgid "Remote action:"
-msgstr "Azione remota:"
-
 msgid "Remove"
 msgstr "Rimuovi"