staypuft 0.0.15 → 0.0.16

data/app/models/staypuft/concerns/hostgroup_extensions.rb

@@ -23,25 +23,27 @@ module Staypuft::Concerns::HostgroupExtensions
   end
 
   def current_param_value(key)
-    if (v = LookupValue.where(:lookup_key_id => key.id, :id => lookup_values).first)
-      return v.value, to_label
+    lookup_value = LookupValue.where(:lookup_key_id => key.id, :id => lookup_values).first
+    if lookup_value
+      [lookup_value.value, to_label]
+    else
+      inherited_lookup_value(key)
     end
-    return inherited_lookup_value(key)
   end
 
   def current_param_value_str(key)
-    val = current_param_value(key)[0]
-    val.is_a?(Array) ? val.join(", ") : val
+    lookup_value, _ = current_param_value(key)
+    return key.value_before_type_cast(lookup_value)
   end
 
   def set_param_value_if_changed(puppetclass, key, value)
-    lookup_key    = puppetclass.class_params.where(:key => key).first
-    current_value = current_param_value(lookup_key)[0]
-    new_value     = current_value.is_a?(Array) ? value.split(", ") : value
-    unless current_value == new_value
+    lookup_key         = puppetclass.class_params.where(:key => key).first
+    lookup_value_value = current_param_value(lookup_key)[0]
+    current_value      = lookup_key.value_before_type_cast(lookup_value_value).to_s.chomp
+    if current_value != value
       lookup       = LookupValue.where(:match         => hostgroup.send(:lookup_value_match),
                                        :lookup_key_id => lookup_key.id).first_or_initialize
-      lookup.value = new_value
+      lookup.value = value
       lookup.save!
     end
   end

data/app/overrides/hide_subscription_manager_passwords.rb

@@ -1,7 +1,35 @@
+# older deface requires code prefix for erb tags
+if Gem.loaded_specs['deface'].version >= Gem::Version.new('1.0.0')
+  erb_tag = 'erb[loud]'
+else
+  erb_tag = 'code[erb-loud]'
+end
+
 Deface::Override.new(:virtual_path => "common_parameters/_inherited_parameters",
-                     :name => "hide_subscription_manager_passwords",
-                     :surround => 'td.col-md-7 erb[loud]:contains("parameter_value_field inherited_parameters[name]")',
+                     :name => "hide_subscription_manager_passwords_in_host_form",
+                     :surround => 'td.col-md-7 ' + erb_tag + ':contains("parameter_value_field inherited_parameters[name]")',
                      :original => '<%= parameter_value_field inherited_parameters[name] %>',
                      :text => "<% if name == 'subscription_manager_password' %>*****<% else %><%= render_original %><% end %>"
                      )
 
+Deface::Override.new(:virtual_path => "common_parameters/_parameter",
+                     :name => "hide_subscription_manager_passwords_in_parameter_form",
+                     :surround => 'td.col-md-7 ' + erb_tag + %q(:contains('f.text_area(:value, :class => "form-control", :rows => line_count(f, :value), :disabled => (not authorized_via_my_scope("host_editing", "edit_params")), :placeholder => _("Value"))')),
+                     :original => '<%= f.text_area(:value, :class => "form-control", :rows => line_count(f, :value), :disabled => (not authorized_via_my_scope("host_editing", "edit_params")), :placeholder => _("Value")) %>',
+                     :text => "<% if f.object.name == 'subscription_manager_password' %><%= f.password_field :value, :class => 'form-control', :disabled => (not authorized_via_my_scope('host_editing', 'edit_params')), :value => f.object.value %><% else %><%= render_original %><% end %>"
+                     )
+
+
+Deface::Override.new(:virtual_path => "common_parameters/index",
+                     :name => "hide_subscription_manager_passwords_on_index",
+                     :surround => 'td ' + erb_tag + ':contains("trunc(common_parameter.safe_value, 80)")',
+                     :original => '<%= trunc(common_parameter.safe_value, 80) %>',
+                     :text => "<% if common_parameter.name == 'subscription_manager_password' %>*****<% else %><%= render_original %><% end %>"
+                     )
+
+Deface::Override.new(:virtual_path => "common_parameters/_form",
+                     :name => "hide_subscription_manager_passwords_in_form",
+                     :surround => erb_tag + %q(:contains('text_f f, :value, :size => "col-md-8"')),
+                     :original => '<%= text_f f, :value, :size => "col-md-8" %>',
+                     :text => "<% if @common_parameter.name == 'subscription_manager_password' %><%= password_f f, :value, :size => 'col-md-8', :value => @common_parameter.value %><% else %><%= render_original %><% end %>"
+                     )

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors: