-
Notifications
You must be signed in to change notification settings - Fork 357
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
Fixed if condition to check for action instead of action_name #2790
Conversation
Testing now. @eclarizio can you review as well. |
This is working for me now. Only seeing a single set of submit/cancel buttons for service ordering. |
@@ -2059,7 +2059,7 @@ def replace_right_cell(options = {}) | |||
} | |||
end | |||
end | |||
if Settings.product.old_dialog_user_ui || action_name != "svc_catalog_provision" | |||
if Settings.product.old_dialog_user_ui && action == "dialog_provision" |
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.
I think this solves the issue of double buttons but the && action == "dialog_provision"
is unecessary, since we're already in an elsif
block that has determined that action == "dialog_provision"
. This would then change this to just if Settings.product.old_dialog_user_ui
, which I think is safe to do since there's no other action that should go through this path.
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.
@eclarizio you are right, made suggested changes
When Order button is clicked from list view, action_name value is sent up as x_button making the code go thru if condition and show double buttons on screen. https://bugzilla.redhat.com/show_bug.cgi?id=1514593
a301d1b
to
c877220
Compare
Checked commit h-kataria@c877220 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0 |
Spec test to verify fix in ManageIQ#2790 https://bugzilla.redhat.com/show_bug.cgi?id=1514593
Fixed if condition to check for action instead of action_name (cherry picked from commit e9bf2e7) https://bugzilla.redhat.com/show_bug.cgi?id=1517882
Gaprindashvili backport details:
|
When Order button is clicked from list view, action_name value is sent up as x_button making the code go thru if condition and show double buttons on screen.
https://bugzilla.redhat.com/show_bug.cgi?id=1514593
@gmcculloug please test.