Project

General

Profile

« Previous | Next » 

Revision 5081efd9

Added by Shimon Shtein almost 9 years ago

Fixes #11255 - Fixed inheritance checks for explicit input on host clone

View differences:

app/helpers/hosts_and_hostgroups_helper.rb
select_f f, :puppet_ca_proxy_id, proxies, :id, :name,
{ :include_blank => blank_or_inherit_f(f, :puppet_ca_proxy),
:disable_button => can_override ? _(INHERIT_TEXT) : nil,
:disable_button_enabled => override && !params[:host][:puppet_ca_proxy_id],
:disable_button_enabled => override && !explicit_value?(:puppet_ca_proxy_id),
:user_set => params[:host] && params[:host][:puppet_ca_proxy_id]
},
{ :label => _("Puppet CA"),
......
select_f f, :puppet_proxy_id, proxies, :id, :name,
{ :include_blank => blank_or_inherit_f(f, :puppet_proxy),
:disable_button => can_override ? _(INHERIT_TEXT) : nil,
:disable_button_enabled => override && !params[:host][:puppet_proxy_id],
:disable_button_enabled => override && !explicit_value?(:puppet_proxy_id),
:user_set => params[:host] && params[:host][:puppet_proxy_id]
},
......
:id, :to_label,
{ :include_blank => true,
:disable_button => can_override ? _(INHERIT_TEXT) : nil,
:disable_button_enabled => override && !params[:host][:realm_id],
:disable_button_enabled => override && !explicit_value?(:realm_id),
:user_set => params[:host] && params[:host][:realm_id]
},
{ :help_inline => :indicator }
......
classes.where(:id => klasses)
end
def explicit_value?(field)
return true if params[:action] == 'clone'
return false unless params[:host]
!!params[:host][field]
end
end

Also available in: Unified diff