Fixes #12843 - lookup values are hidden when creating them if lookup key is hidden #2981
Conversation
| @@ -40,7 +40,8 @@ def use_puppet_default_help link_title = nil, title = _("Use Puppet default") | |||
| end | |||
|
|
|||
| def hidden_value_field(f, field, value, disabled, options = {}) | |||
| if f.object.hidden_value? | |||
| hidden = options.delete(:hidden_value) | |||
| if f.object.hidden_value? || hidden | |||
There was a problem hiding this comment.
I would switch the order of this || in case the option is passed explicitly to save checking the form object.
|
@tbrisker I fixed all of your comments |
| @@ -40,7 +40,8 @@ def use_puppet_default_help link_title = nil, title = _("Use Puppet default") | |||
| end | |||
|
|
|||
| def hidden_value_field(f, field, value, disabled, options = {}) | |||
| if f.object.hidden_value? | |||
| hidden = options.delete(:hidden_value) | |||
| if hidden || f.object.hidden_value? | |||
There was a problem hiding this comment.
if hidden==false, this will still check f.object.hidden_value?.
There was a problem hiding this comment.
f.object.hidden_value? will have the same value as hidden or it will be nil so if hidden is false the whole condition will be false anyway so that's fine.
|
@tbrisker I fixed one comment and answered the rest. |
|
👍 LGTM. |
|
@orrabin, this pull request is currently not mergeable. Please rebase against the develop branch and push again. If you have a remote called 'upstream' that points to this repository, you can do this by running: This message was auto-generated by Foreman's prprocessor |
theforeman-bot
added
Waiting on contributor
and removed
Needs testing
Needs re-review
Not yet reviewed
labels
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
[test] |
|
@dLobatog can you take a look? I fixed all the comments and the test failures are unrelated. |
|
@orrabin Thanks. It fixes the behavior the bug describes, but now unticking
If I try to hide a smart class parameter, still all fields are shown on the clear and cannot be hidden until I save it:
|
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
@dLobatog I fixed it and rebased. |
|
[test] |
|
Test failure is the usual integration test, not related with this. |
No description provided.