foreman_puppet 6.0.1 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ddb41ece0ec9add7b77e958a35fe39da8ff7588a7cd6bb0900a09bbc5a9853b
-  data.tar.gz: 5054407779deb586f36b4af5ef98a21031511c3f195d8365a2525fe2a5668de8
+  metadata.gz: 834756820191b5727c348fc6634bd16ba92814c724162acb08de5319c56bf396
+  data.tar.gz: 28bdc4e212e0a28abfc12408cab07b99dd1c13a65bef9a24db8d5fda8f289870
 SHA512:
-  metadata.gz: c6c095009c3211f066ac1966190edf4598715c636a176ae824eccf3218f85a606c88f89672dd4cb4e6154b9b9a4fe58255e1799f214a5df8848b9e6a6656266d
-  data.tar.gz: a3711124b1bfc9659070261f9a8aaa4ba4a6de3dc2c021967f80d481b29b35a582b12153ad27cc7a7d32c887c3733ef1550edcad43ee37054640b351250ee219
+  metadata.gz: 8b6484c60362fde0b41be50af04fc57cc3a7d14f9cde9fce6de2429657139ba7c3bf78a1dfaf98ead3b09aeecdbc53e2e639a213b02e7dd7425622c9dcf04314
+  data.tar.gz: da5b35f5796b9490597fff93c0938d94bfb39b557ea686146e20301173468b1e8bfce20272930e0b2a258b9eb2f51e58dcbe5a2b29984e44312641a3561d75e0

data/app/assets/javascripts/foreman_puppet/locale/ca/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         ""
       ],
+      "Puppet Environments": [
+        "Entorns de Puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organitzacions"
       ],
-      "Puppet Environments": [
-        "Entorns de Puppet"
-      ],
       "Environment|Name": [
         "Nom"
       ],

data/app/assets/javascripts/foreman_puppet/locale/cs_CZ/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Změněná prostředí"
       ],
+      "Puppet Environments": [
+        "Puppet prostředí"
+      ],
       "Select the changes you want to apply to Foreman": [
         "Vyberte změny které chcete uplatnit na Forman"
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organizace"
       ],
-      "Puppet Environments": [
-        "Puppet prostředí"
-      ],
       "Environment|Name": [
         "Environment|Název"
       ],

data/app/assets/javascripts/foreman_puppet/locale/de/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Geänderte Umgebungen"
       ],
+      "Puppet Environments": [
+        "Puppet-Umgebungen"
+      ],
       "Select the changes you want to apply to Foreman": [
         "Wählen Sie die Änderungen, die Sie in Foreman anwenden möchten"
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organisationen"
       ],
-      "Puppet Environments": [
-        "Puppet-Umgebungen"
-      ],
       "Environment|Name": [
         "Name"
       ],

data/app/assets/javascripts/foreman_puppet/locale/en/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         ""
       ],
+      "Puppet Environments": [
+        ""
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         ""
       ],
-      "Puppet Environments": [
-        ""
-      ],
       "Environment|Name": [
         ""
       ],

data/app/assets/javascripts/foreman_puppet/locale/en_GB/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         ""
       ],
+      "Puppet Environments": [
+        ""
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organisations"
       ],
-      "Puppet Environments": [
-        ""
-      ],
       "Environment|Name": [
         "Name"
       ],

data/app/assets/javascripts/foreman_puppet/locale/es/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Entornos modificados"
       ],
+      "Puppet Environments": [
+        "Entornos Puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         "Seleccione los cambios que desea aplicar a Foreman"
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organizaciones"
       ],
-      "Puppet Environments": [
-        "Entornos Puppet"
-      ],
       "Environment|Name": [
         "Nombre"
       ],

data/app/assets/javascripts/foreman_puppet/locale/fr/foreman_puppet.js

@@ -483,6 +483,9 @@
       "Changed environments": [
         "Environnements modifiés"
       ],
+      "Puppet Environments": [
+        "Environnements Puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         "Sélectionner les changements que vous souhaitez appliquer à Foreman"
       ],
@@ -591,9 +594,6 @@
       "Organizations": [
         "Organisations"
       ],
-      "Puppet Environments": [
-        "Environnements Puppet"
-      ],
       "Environment|Name": [
         "Nom"
       ],

data/app/assets/javascripts/foreman_puppet/locale/gl/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         ""
       ],
+      "Puppet Environments": [
+        "Entornos Puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organizacións"
       ],
-      "Puppet Environments": [
-        "Entornos Puppet"
-      ],
       "Environment|Name": [
         "Nome"
       ],

data/app/assets/javascripts/foreman_puppet/locale/it/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Ambienti modificati"
       ],
+      "Puppet Environments": [
+        "Ambienti del puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organizzazioni"
       ],
-      "Puppet Environments": [
-        "Ambienti del puppet"
-      ],
       "Environment|Name": [
         "Nome"
       ],

data/app/assets/javascripts/foreman_puppet/locale/ja/foreman_puppet.js

@@ -479,6 +479,9 @@
       "Changed environments": [
         "変更済みの環境"
       ],
+      "Puppet Environments": [
+        "Puppet 環境"
+      ],
       "Select the changes you want to apply to Foreman": [
         "Foreman に適用する変更を選択してください"
       ],
@@ -587,9 +590,6 @@
       "Organizations": [
         "組織"
       ],
-      "Puppet Environments": [
-        "Puppet 環境"
-      ],
       "Environment|Name": [
         "名前"
       ],

data/app/assets/javascripts/foreman_puppet/locale/ka/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "შეცვლილი გარემოები"
       ],
+      "Puppet Environments": [
+        "Puppet-ის გარემოები"
+      ],
       "Select the changes you want to apply to Foreman": [
         "აირჩიეთ ცვლილებები, რომლებიც გნებავთ Foreman-ს გადაატაროთ"
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "ორგანიზაციები"
       ],
-      "Puppet Environments": [
-        "Puppet-ის გარემოები"
-      ],
       "Environment|Name": [
         "გარემო|სახელი"
       ],

data/app/assets/javascripts/foreman_puppet/locale/ko/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "변경된 환경 "
       ],
+      "Puppet Environments": [
+        "Puppet 환경"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "조직"
       ],
-      "Puppet Environments": [
-        "Puppet 환경"
-      ],
       "Environment|Name": [
         "이름 "
       ],

data/app/assets/javascripts/foreman_puppet/locale/nl_NL/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Gewijzigde omgevingen"
       ],
+      "Puppet Environments": [
+        ""
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         ""
       ],
-      "Puppet Environments": [
-        ""
-      ],
       "Environment|Name": [
         ""
       ],

data/app/assets/javascripts/foreman_puppet/locale/pl/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Zmieniono środowisko"
       ],
+      "Puppet Environments": [
+        "Środowiska Puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organizacje"
       ],
-      "Puppet Environments": [
-        "Środowiska Puppet"
-      ],
       "Environment|Name": [
         "Środowisko|Nazwa"
       ],

data/app/assets/javascripts/foreman_puppet/locale/pt_BR/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Ambientes modificados"
       ],
+      "Puppet Environments": [
+        "Ambientes Puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         "Selecione as alterações que deseja aplicar ao Foreman"
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organizações"
       ],
-      "Puppet Environments": [
-        "Ambientes Puppet"
-      ],
       "Environment|Name": [
         "Nome"
       ],

data/app/assets/javascripts/foreman_puppet/locale/ru/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Изменение окружений"
       ],
+      "Puppet Environments": [
+        "Окружения Puppet"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Организации"
       ],
-      "Puppet Environments": [
-        "Окружения Puppet"
-      ],
       "Environment|Name": [
         "Имя"
       ],

data/app/assets/javascripts/foreman_puppet/locale/sv_SE/foreman_puppet.js

@@ -481,6 +481,9 @@
       "Changed environments": [
         "Ändrade miljöer"
       ],
+      "Puppet Environments": [
+        "Puppet Miljöer"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "Organisationer"
       ],
-      "Puppet Environments": [
-        "Puppet Miljöer"
-      ],
       "Environment|Name": [
         "Namn"
       ],

data/app/assets/javascripts/foreman_puppet/locale/zh_CN/foreman_puppet.js

@@ -479,6 +479,9 @@
       "Changed environments": [
         "修改的环境"
       ],
+      "Puppet Environments": [
+        "Puppet 环境"
+      ],
       "Select the changes you want to apply to Foreman": [
         "选择您要应用到 Foreman 的更改"
       ],
@@ -587,9 +590,6 @@
       "Organizations": [
         "机构"
       ],
-      "Puppet Environments": [
-        "Puppet 环境"
-      ],
       "Environment|Name": [
         "名称"
       ],

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

@@ -481,6 +481,9 @@
       "Changed environments": [
         "已更改的環境"
       ],
+      "Puppet Environments": [
+        "Puppet 環境"
+      ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
@@ -589,9 +592,6 @@
       "Organizations": [
         "組織"
       ],
-      "Puppet Environments": [
-        "Puppet 環境"
-      ],
       "Environment|Name": [
         "名稱"
       ],

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

@@ -13,8 +13,6 @@ module ForemanPuppet
         include_in_clone puppet: %i[config_groups host_config_groups host_classes]
 
         scoped_search relation: :environment, on: :name, complete_value: true, rename: :environment
-        scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ '],
-          ext_method: :search_by_deprecated_class
         scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :puppetclass, only_explicit: true, operators: ['= ', '~ '],
           ext_method: :search_by_puppetclass
         scoped_search relation: :config_groups, on: :name, complete_value: true, rename: :config_group, only_explicit: true, operators: ['= ', '~ '],
@@ -22,11 +20,6 @@ module ForemanPuppet
       end
 
       class_methods do
-        def search_by_deprecated_class(key, operator, value)
-          Foreman::Deprecation.deprecation_warning('3.2', 'search by `class` has been deprecated, please search by `puppetclass` instead')
-          search_by_puppetclass(key, operator, value)
-        end
-
         def search_by_puppetclass(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["puppetclasses.name #{operator} ?", value_to_sql(operator, value)])
           config_group_ids = ForemanPuppet::ConfigGroup.joins(:puppetclasses).where(conditions).pluck(:id)

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

@@ -16,7 +16,12 @@ module ForemanPuppet
 
         # will need through relation to work properly
         scoped_search relation: :environment, on: :name, complete_value: true, rename: :environment, only_explicit: true
-        scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ ']
+        scoped_search relation: :puppetclasses, on: :name,
+          complete_value: true,
+          rename: :puppetclass,
+          only_explicit: true,
+          operators: ['= ', '~ '],
+          ext_method: :search_by_puppetclass
         scoped_search relation: :config_groups, on: :name,
           complete_value: true,
           rename: :config_group,
@@ -29,11 +34,22 @@ module ForemanPuppet
       module PatchedClassMethods
         def search_by_config_group(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["config_groups.name #{operator} ?", value_to_sql(operator, value)])
-          hostgroup_ids = ::Hostgroup.unscoped.with_taxonomy_scope.joins(puppet: :config_groups).where(conditions).map(&:subtree_ids).flatten.uniq
+          hostgroup_ids = ::Hostgroup.joins(puppet: :config_groups).where(conditions).map(&:subtree_ids).flatten.uniq
+
+          conds = 'hostgroups.id < 0'
+          conds = "hostgroups.id IN(#{hostgroup_ids.join(',')})" if hostgroup_ids.present?
+
+          { conditions: conds }
+        end
+
+        def search_by_puppetclass(_key, operator, value)
+          conditions = sanitize_sql_for_conditions(["puppetclasses.name #{operator} ?", value_to_sql(operator, value)])
+          hostgroup_ids = ::Hostgroup.joins(puppet: :puppetclasses).where(conditions).map(&:subtree_ids)
+
+          conds = []
+          conds << "hostgroups.id IN (#{hostgroup_ids.join(',')})" if hostgroup_ids.present?
 
-          opts = 'hostgroups.id < 0'
-          opts = "hostgroups.id IN(#{hostgroup_ids.join(',')})" if hostgroup_ids.present?
-          { conditions: opts }
+          { conditions: conds.join(' OR ').presence || 'hostgroups.id < 0' }
         end
       end
     end

data/app/models/foreman_puppet/config_group.rb

@@ -17,7 +17,7 @@ module ForemanPuppet
     validates :name, presence: true, uniqueness: true
 
     scoped_search on: :name, complete_value: true
-    scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ ']
+    scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :puppetclass, only_explicit: true, operators: ['= ', '~ ']
 
     default_scope -> { order('config_groups.name') }
 

data/app/views/foreman_puppet/layouts/application_react.html.erb

@@ -7,9 +7,8 @@
 <% end %>
 
 <% content_for(:content) do %>
-  <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
   <%= react_component('ForemanPuppet') %>
 <% end %>
-<%= render file: "layouts/base" %>
+<%= render template: "layouts/base" %>

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '6.0.1'.freeze
+  VERSION = '6.1.1'.freeze
 end

data/locale/Makefile

@@ -6,8 +6,8 @@
 # make tx-update - download and merge translations from Transifex
 # make clean - clean everything
 #
-DOMAIN = foreman_puppet
-VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+DOMAIN = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).name')
+VERSION = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
 POFILES = $(shell find . -name '$(DOMAIN).po')
@@ -43,7 +43,7 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	cd .. && tx pull -f
+	cd .. && tx pull -f --all
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done