Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Set the action parameter replace_right_cell's on button update and reset #3236

Merged
merged 2 commits into from
Jan 12, 2018
Merged

Set the action parameter replace_right_cell's on button update and reset #3236

merged 2 commits into from
Jan 12, 2018

Conversation

lgalis
Copy link
Contributor

@lgalis lgalis commented Jan 12, 2018 •
edited
Loading

Set the action parameter replace_right_cell's on button update and reset

Links

https://bugzilla.redhat.com/show_bug.cgi?id=1533643

Steps for Testing/QA

  1. Create a Custom Button in Button Group for Service Template (Services->Catalogs->All Catalog Items -> Action ... )
  2. Edit new Button -> click on 'Define Expression' -> enter some expression
  • or press Reset after other changes

Before:

screenshot from 2018-01-12 14-46-06

After:

screenshot from 2018-01-12 14-35-00

@miq-bot miq-bot added the wip label Jan 12, 2018
@lgalis lgalis force-pushed the fix_update_and_reset_button_on_catalog branch from 2cf2802 to 5a0b57e Compare January 12, 2018 19:15
@lgalis
Copy link
Contributor Author

lgalis commented Jan 12, 2018

@miq-bot add_label bug, blocker, gaprindashvili/yes

@miq-bot
Copy link
Member

miq-bot commented Jan 12, 2018

Checked commits lgalis/manageiq-ui-classic@15dbcfc~...5a0b57e with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. ⭐

@lgalis lgalis changed the title [WIP] Set the action parameter replace_right_cell's on button update and reset Set the action parameter replace_right_cell's on button update and reset Jan 12, 2018
@lgalis
Copy link
Contributor Author

lgalis commented Jan 12, 2018

@h-kataria - please review

@miq-bot miq-bot removed the wip label Jan 12, 2018
h-kataria
h-kataria reviewed Jan 12, 2018
View reviewed changes
app/controllers/application_controller/buttons.rb
@@ -624,7 +624,7 @@ def ab_button_reset
drop_breadcrumb(:name => _("Edit of Button"), :url => "/miq_ae_customization/button_edit")
@lastaction = "automate_button"
@layout = "miq_ae_automate_button"
replace_right_cell(:nodetype => "button_edit")
replace_right_cell(:action => "button_edit")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lgalis changing this to pass in :action instead of :nodetype might break custom button editor in Customization explorer, i think we should pass in both keys here in order for this to work in both explorers. Will need to test this though. same suggestion on line 496 as well

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lgalis verified in UI, both explorers seems to be working fine, ignore my previous comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@h-kataria - thank you - I have tried the button editor in both the service as well as auomation before creating the PR.

@h-kataria h-kataria self-assigned this Jan 12, 2018
@h-kataria h-kataria added this to the Sprint 77 Ending Jan 15, 2018 milestone Jan 12, 2018
@h-kataria h-kataria merged commit 6f8c0b9 into ManageIQ:master Jan 12, 2018
@lgalis lgalis deleted the fix_update_and_reset_button_on_catalog branch January 12, 2018 23:01
simaishi pushed a commit that referenced this pull request Jan 12, 2018
@h-kataria @simaishi
Merge pull request #3236 from lgalis/fix_update_and_reset_button_on_c…
f9f6ba2 
…atalog

Set the action parameter  replace_right_cell's  on button update and reset
(cherry picked from commit 6f8c0b9)

https://bugzilla.redhat.com/show_bug.cgi?id=1534058
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit f9f6ba28818f80b11b5d7b70f0b9a258dfc99e9e
Author: Harpreet Kataria <[email protected]>
Date:   Fri Jan 12 17:51:09 2018 -0500

    Merge pull request #3236 from lgalis/fix_update_and_reset_button_on_catalog
    
    Set the action parameter  replace_right_cell's  on button update and reset
    (cherry picked from commit 6f8c0b91cbcd1f6bb9378e281228f4ecbb8a165e)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1534058

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@h-kataria h-kataria h-kataria left review comments

Assignees

@h-kataria h-kataria

Labels
blocker bug gaprindashvili/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lgalis @miq-bot @simaishi @h-kataria