foreman_puppet 5.1.2 → 6.0.1

data/app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb

@@ -1,4 +1,9 @@
 <% title _("Changed environments") %>
+<%= breadcrumbs(switchable: false,
+                items: [
+                  { caption: _('Puppet Environments'), url: environments_path },
+                  { caption: _('Changed environments') }
+                ]) %>
 <%= form_tag controller.send("obsolete_and_new_#{controller_name}_path") do %>
   <h4><%= _("Select the changes you want to apply to Foreman") %></h4>
   <h6>

data/app/views/foreman_puppet/environments/welcome.html.erb

@@ -1,7 +1,7 @@
 <% content_for(:title, _("Puppet environments")) %>
-<%= breadcrumbs(:switchable => false,
-                :items => [
-                  { :caption => _('Puppet Environments'), :url => environments_path },
+<%= breadcrumbs(switchable: false,
+                items: [
+                  { caption: _('Puppet Environments'), url: environments_path },
                   { caption: @page_header }
                 ]) %>
 

data/app/views/foreman_puppet/puppetclasses/_selected_classes.html.erb

@@ -1,4 +1,9 @@
-<%= content_tag :li, id: "selected_puppetclass_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(obj.environment.present? ? obj.environment : @environment))] do %>
+<%
+  id = "selected_puppetclass_#{klass.id}"
+  css = [dom_class(klass, 'selected'), cycle('even', 'odd')]
+  css << 'unavailable' unless klass.environments.include?(obj.try(:environment).presence || @environment)
+%>
+<%= content_tag :li, id: id, class: css do %>
   <%= link_to_remove_puppetclass(klass, obj) %>
   <%= hidden_field_tag "#{resource_type}[puppetclass_ids][]", klass.id %>
 <% end %>

data/app/views/smart_proxies/plugins/_puppet.html.erb

@@ -1,4 +1,3 @@
-<% javascript 'charts' %>
 <ul id="proxy-puppet-tab" class="nav nav-tabs nav-tabs-pf">
   <li class="active"><a href="#puppet_dashboard" data-toggle="tab"><%= _('General')%></a></li>
   <li><a href="#puppet_envs" data-toggle="tab"><%= _('Environments') %></a></li>
@@ -16,7 +15,7 @@
         </div>
       </div>
     </div>
-    <div class="clearfix row container-cards-pf container-fluid" data-ajax-url="<%= foreman_puppet.dashboard_puppet_smart_proxy_path(@smart_proxy) %>" data-on-complete="refreshCharts"><%= spinner %></div>
+    <div class="clearfix row container-cards-pf container-fluid" data-ajax-url="<%= foreman_puppet.dashboard_puppet_smart_proxy_path(@smart_proxy) %>"><%= spinner %></div>
   </div>
   <div class="tab-pane" id="puppet_envs" data-ajax-url="<%= foreman_puppet.environments_puppet_smart_proxy_path(@smart_proxy) %>">
     <%= spinner %>

data/lib/foreman_puppet/engine.rb

@@ -91,11 +91,5 @@ module ForemanPuppet
         ForemanPuppet::Engine.load_seed
       end
     end
-
-    initializer 'foreman_puppet.register_gettext', after: :load_config_initializers do |_app|
-      locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
-      locale_domain = 'foreman_puppet'
-      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
-    end
   end
 end

data/lib/foreman_puppet/register.rb

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

data/lib/foreman_puppet/version.rb

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

data/locale/Makefile

@@ -14,6 +14,7 @@ POFILES = $(shell find . -name '$(DOMAIN).po')
 MOFILES = $(patsubst %.po,%.mo,$(POFILES))
 POXFILES = $(patsubst %.po,%.pox,$(POFILES))
 EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
+JSFILES = $(shell find ../app/assets/javascripts/*/locale -name '$(DOMAIN).js')
 
 %.mo: %.po
 	mkdir -p $(shell dirname $@)/LC_MESSAGES
@@ -42,18 +43,20 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	tx pull -f
+	cd .. && tx pull -f
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done
 
 tx-update: tx-pull
 	@echo
-	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation
+	@echo then run rake plugin:po_to_json[$(DOMAIN)] from the Foreman installation
+	@echo then run make -C locale mo-files to finish
 	@echo
 
 mo-files: $(MOFILES)
-	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	git add $(POFILES) $(POTFILE) $(JSFILES) ../locale/*/LC_MESSAGES
 	git commit -m "i18n - pulling from tx"
 	@echo
 	@echo Changes commited!