Use copy_params_if_present in report, miq_policy and pxe controllers #6155
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@miq-bot add_label technical debt |
|
@miq-bot add_reviewer @romanblanco Roman, this should be all the remaining possible changes regarding using |
romanblanco
reviewed
Sep 5, 2019
There was a problem hiding this comment.
@hstastna changes look good!
found some more places where we can use copy_param(s)_if_present
| targets = Rbac.filtered(params[:target_class]).select(:id, *columns_for_klass(params[:target_class])) if params[:target_class].present? | ||
| unless targets.nil? | ||
| @resolve[:targets] = targets.sort_by { |t| t.name.downcase }.collect { |t| [t.name, t.id.to_s] } | ||
| @resolve[:new][:target_id] = nil | ||
| end | ||
| end | ||
| @resolve[:new][:target_id] = nil if params[:target_class] == "" | ||
| @resolve[:new][:target_id] = params[:target_id] if params.key?(:target_id) | ||
| @resolve[:new][:target_id] = nil unless params[:target_class] | ||
| @resolve[:button_text] = params[:button_text] if params.key?(:button_text) | ||
| @resolve[:button_number] = params[:button_number] if params.key?(:button_number) |
There was a problem hiding this comment.
- @resolve[:button_text] = params[:button_text] if params.key?(:button_text)
- @resolve[:button_number] = params[:button_number] if params.key?(:button_number)
+ copy_params_if_present(@resolve, params, %i[button_text button_number])| ApplicationController::AE_MAX_RESOLUTION_FIELDS.times do |i| | ||
| f = ("attribute_" + (i + 1).to_s) | ||
| v = ("value_" + (i + 1).to_s) | ||
| @resolve[:new][:attrs][i][0] = params[f] if params[f.to_sym] | ||
| @resolve[:new][:attrs][i][1] = params[v] if params[v.to_sym] | ||
| end | ||
| @resolve[:new][:target_class] = params[:target_class] if params[:target_class] | ||
| # @resolve[:new][:target_attr_name] = params[:target_attr_name] if params.has_key?(:target_attr_name) |
There was a problem hiding this comment.
the commented code can be removed
| @@ -86,18 +86,14 @@ def action_field_changed | |||
| @action = @edit[:action_id] ? MiqAction.find(@edit[:action_id]) : MiqAction.new | |||
|
|
|||
| @edit[:new][:description] = params[:description].presence if params[:description] | |||
There was a problem hiding this comment.
- @edit[:new][:description] = params[:description].presence if params[:description]
+ copy_param_if_present(@edit[:new], params, %i[description])
hstastna
force-pushed
the
Report_miq_policy_copy_params_present
branch
from
2da9a2b to
56fa533
Compare
hstastna
force-pushed
the
Report_miq_policy_copy_params_present
branch
from
56fa533 to
6735efd
Compare
|
Checked commit hstastna@6735efd with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue: #6105
This is another PR with use of
copy_params_if_presentmethod in some controllers.With
copy_params_if_present, we improve functionality (remove""vsnilissues and bad response of Add/Save buttons) or we simplify the code.Similar PRs/changes:
#6152
#6139
#5815
d3c3878#diff-956e46b33fb5307990c4e1a4b5fd86ccR1267