ApplicationController: fix rubocop warnings #4658
Merged
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
mzazrivec
force-pushed
the
fix_rubocop_warnings_in_application_controller
branch
from
cc4c7b3 to
efa3fc3
Compare
romanblanco
reviewed
Sep 13, 2018
| @@ -650,14 +651,14 @@ def build_ae_tree(type = :ae, name = :ae_tree) | |||
|
|
|||
| # moved this method here so it can be accessed from pxe_server controller as well | |||
| def log_depot_set_verify_status | |||
| if (@edit[:new][:log_password] == @edit[:new][:log_verify]) && @edit[:new][:uri_prefix] != "nfs" && | |||
There was a problem hiding this comment.
@mzazrivec I would use extra variables to improve readability here:
- @edit[:log_verify_status] = if (@edit[:new][:log_password] == @edit[:new][:log_verify]) && @edit[:new][:uri_prefix] != "nfs" &&
- (@edit[:new][:uri].present? && @edit[:new][:log_userid].present? && @edit[:new][:log_password].present? && @edit[:new][:log_verify].present?)
- true
- elsif @edit[:new][:uri_prefix] == "nfs" && @edit[:new][:uri].present?
- true
- else
- false
- end
+ uri_filled = @edit[:new][:uri].present?
+ nfs_prefix = (@edit[:new][:uri_prefix] == "nfs")
+ passwords_match = (@edit[:new][:log_password] == @edit[:new][:log_verify])
+ authentication_credentials_filled = (
+ uri_filled &&
+ @edit[:new][:log_userid].present? &&
+ @edit[:new][:log_password].present? &&
+ @edit[:new][:log_verify].present?
+ )
+
+ @edit[:log_verify_status] = (
+ (nfs_prefix && uri_filled) ||
+ (!nfs_prefix && authentication_credentials_filled && passwords_match)
+ )...what do you think?
Maybe in a separate PR.
There was a problem hiding this comment.
I simplified the condition inside that routine and also moved the routine to PxeController, since it's used only in that controller.
- rename the method to log_depot_verify_status() - don't set @edit[:log_verify_status] inside the routine - simplify the condition inside the routine
|
Checked commits mzazrivec/manageiq-ui-classic@efa3fc3~...63b6e72 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 app/controllers/application_controller.rb
|
himdel
reviewed
Sep 17, 2018
| end | ||
| next if current.present? && (new[k][hk] == current[k][hk]) | ||
| msg_arr << if password_field?(hk) # Asterisk out password fields | ||
| "#{hk}:[*]#{' to [*]' unless current.nil?}" |
There was a problem hiding this comment.
unless used inside a string interpolation 🤢
Probably a separate PR, right?
$ ag '"[^"]*#{[^}]*\b(unless|if)'
app/controllers/application_controller.rb
700: msg_arr << "#{k}:[*]#{' to [*]' unless current.nil?}"
708: msg_arr << "#{hk}:[*]#{' to [*]' unless current.nil?}"
app/controllers/report_controller/reports/editor.rb
811: (suffix ? " (#{MiqReport.date_time_break_suffixes.collect { |s| s.first i s.last == suffix }.compact.join})" : "") +
app/helpers/vm_helper/textual_summary.rb
259: :value => "#{s.name}#{" (main)" if s == main}",
There was a problem hiding this comment.
Yes, I'd rather address that in a separate PR.
mzazrivec
deleted the
fix_rubocop_warnings_in_application_controller
branch
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.
No description provided.