Revision 58ea0de6
Added by Joseph Magen almost 10 years ago
app/helpers/hosts_and_hostgroups_helper.rb | ||
---|---|---|
def puppet_ca f
|
||
# Don't show this if we have no CA proxies, otherwise always include blank
|
||
# so the user can choose not to sign the puppet cert on this host
|
||
proxies = SmartProxy.unscoped.with_features("Puppet CA").with_taxonomy_scope(@location,@organization)
|
||
proxies = SmartProxy.unscoped.with_features("Puppet CA").with_taxonomy_scope(@location,@organization,:path_ids)
|
||
return if proxies.count == 0
|
||
select_f f, :puppet_ca_proxy_id, proxies, :id, :name,
|
||
{ :include_blank => blank_or_inherit_f(f, :puppet_ca_proxy) },
|
||
... | ... | |
def puppet_master f
|
||
# Don't show this if we have no Puppet proxies, otherwise always include blank
|
||
# so the user can choose not to use puppet on this host
|
||
proxies = SmartProxy.unscoped.with_features("Puppet").with_taxonomy_scope(@location,@organization)
|
||
proxies = SmartProxy.unscoped.with_features("Puppet").with_taxonomy_scope(@location,@organization,:path_ids)
|
||
return if proxies.count == 0
|
||
select_f f, :puppet_proxy_id, proxies, :id, :name,
|
||
{ :include_blank => blank_or_inherit_f(f, :puppet_proxy) },
|
Also available in: Unified diff
fixes #5685 - add :path_ids to with_taxonomy_scope instead of subtree_ids for SmartProxy select dropdowns