-
Notifications
You must be signed in to change notification settings - Fork 985
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixes #8217, #8214 - Rearranging override section in smart class parameter page and host page #1898
Conversation
Missing "#" before the ticket number, so Redmine won't link it. |
@domcleal sorry, added "#". |
b5bc631
to
993a0aa
Compare
@orrabin cna you rebase please |
@ohadlevy rebased |
<%= f.fields_for :lookup_values do |builder| %> | ||
<%= render "common_parameters/puppetclass_parameter", :f => builder %> | ||
<%= render "common_parameters/puppetclass_parameter", :f => builder %> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nitpick: indent
@tbrisker thanks for your comments, can you please review again? |
:onchange=>'toggleUsePuppetDefaultValue(this, "value")') if is_param %> | ||
<%= checkbox_f(f, :use_puppet_default, :label => _('Use Puppet default'), :size => "col-md-8", | ||
:help_inline => popover(_("Explain use Puppet default"), _('Do not send this parameter via the ENC.<br>Puppet will use the value defined in the Puppet manifest for this parameter.')), | ||
:onchange=>'toggleUsePuppetDefaultValue(this, "value")') if is_param %> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nitpick: indentation
d04be68
to
d7010fc
Compare
<%= f.check_box :use_puppet_default, :'data-property' => 'use_puppet_default', | ||
:disabled => (not authorized_via_my_scope("host_editing", "edit_params")), | ||
:onchange=>'toggleUsePuppetDefaultValue(this, "value")' %> | ||
<%= popover('', _('Do not send this parameter via the ENC. Puppet will use the value defined in the puppet manifest for this parameter')) %> | ||
<%= popover('', _("Do not send this parameter via the ENC.<br> Puppet will use the value defined in the puppet manifest for this parameter")) %> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This also appears in app/views/lookup_keys/_value.html.erb:7 and app/views/lookup_keys/_fields.html.erb:18. However only sometimes is it a popover - consider extracting to helper or otherwise changing to ensure consistency.
In general, the part in the puppetclass form looks good. |
@tbrisker thanks for the review. |
@@ -17,4 +17,8 @@ def parameter_value_field(value) | |||
content_tag(:span, :class => "help-block") { popover(_("Additional info"), _("<b>Source:</b> %{type} %{name}") % {:type => _(value[:source].to_s), :name => source_name})} | |||
end | |||
end | |||
|
|||
def use_puppet_default_help link_title = _("Explain use Puppet default"), title = _("Use Puppet Default") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you make the "Default" lower case please?
@domcleal these are two problems - the second puppet classes is actually overrides and the global parameters need their own header |
@domcleal thanks for testing, I fixed you comments and rebased. |
… in smart class parameter page and host page
[test] |
Looks fine to me, there is still more work to be done to improve the layout and UX but it can be incremental after merging this PR. |
No description provided.