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.

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

Fix show record after generic object custom button dialog run #2745

Merged
merged 13 commits into from
Jan 3, 2018

Conversation

lgalis
Copy link
Contributor

@lgalis lgalis commented Nov 15, 2017

The service title is incorrect after running a generic object custom button with a dialog from the service generic object summary page.

Links

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

Before - errors when cancelling or submitting a dialog for a custom button

After:

screenshot from 2017-11-30 16-06-02
screenshot from 2018-01-03 13-41-01

@miq-bot miq-bot added the wip label Nov 15, 2017
@lgalis
Copy link
Contributor Author

lgalis commented Nov 15, 2017

@miq-bot add_label bug, gaprindashvili/yes

@lgalis lgalis force-pushed the cb_dialog_run_return_to_nested_list branch 2 times, most recently from 0c31516 to 47deff5 Compare November 15, 2017 21:50
@lgalis lgalis changed the title [WIP] Fix show record after generic object custom button dialog run Fix show record after generic object custom button dialog run Nov 16, 2017
@miq-bot miq-bot removed the wip label Nov 16, 2017
@lgalis lgalis changed the title Fix show record after generic object custom button dialog run [WIP] Fix show record after generic object custom button dialog run Nov 16, 2017
@miq-bot miq-bot added the wip label Nov 16, 2017
@lgalis lgalis changed the title [WIP] Fix show record after generic object custom button dialog run Fix show record after generic object custom button dialog run Nov 16, 2017
@lgalis lgalis changed the title Fix show record after generic object custom button dialog run [WIP]Fix show record after generic object custom button dialog run Nov 16, 2017
@lgalis lgalis changed the title [WIP]Fix show record after generic object custom button dialog run Fix show record after generic object custom button dialog run Nov 17, 2017
@miq-bot miq-bot removed the wip label Nov 17, 2017
@h-kataria
Copy link
Contributor

@lgalis can you add before/after screenshots

@miq-bot
Copy link
Member

miq-bot commented Nov 21, 2017

This pull request is not mergeable. Please rebase and repush.

@lgalis lgalis force-pushed the cb_dialog_run_return_to_nested_list branch from 47deff5 to 78b7d14 Compare November 22, 2017 14:20
@lgalis lgalis changed the title Fix show record after generic object custom button dialog run [WIP]Fix show record after generic object custom button dialog run Nov 22, 2017
@miq-bot miq-bot added the wip label Nov 22, 2017
@lgalis
Copy link
Contributor Author

lgalis commented Nov 22, 2017

Setting back to WIP to fix a new issue I see on master when running the CB dialog.

@lgalis lgalis force-pushed the cb_dialog_run_return_to_nested_list branch 4 times, most recently from 80947a4 to 8c3fecd Compare November 30, 2017 21:07
@lgalis lgalis changed the title [WIP]Fix show record after generic object custom button dialog run Fix show record after generic object custom button dialog run Nov 30, 2017
@martinpovolny martinpovolny changed the title [WIP]Fix show record after generic object custom button dialog run [WIP] Fix show record after generic object custom button dialog run Dec 23, 2017
@lgalis lgalis force-pushed the cb_dialog_run_return_to_nested_list branch 2 times, most recently from cf1d685 to c4fa865 Compare January 2, 2018 20:55
@lgalis lgalis changed the title [WIP] Fix show record after generic object custom button dialog run Fix show record after generic object custom button dialog run Jan 2, 2018
@lgalis
Copy link
Contributor Author

lgalis commented Jan 2, 2018

@martinpovolny, @h-kataria - please review

@miq-bot miq-bot removed the wip label Jan 3, 2018
@lgalis lgalis force-pushed the cb_dialog_run_return_to_nested_list branch from c4fa865 to 00c076a Compare January 3, 2018 18:11
@lgalis lgalis force-pushed the cb_dialog_run_return_to_nested_list branch from 00c076a to a171d82 Compare January 3, 2018 18:40
toolbar
end

def custom_button_add_related_buttons(model, record, toolbar)
# For Service, we include buttons for ServiceTemplate.
# These buttons are added as a single group with multiple buttons
if record.present?
Copy link
Contributor

Choose a reason for hiding this comment

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

@lgalis do we need this check, i see record being passed in from the caller

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, record may not always be present

@miq-bot
Copy link
Member

miq-bot commented Jan 3, 2018

Checked commits lgalis/manageiq-ui-classic@25cc68b~...53ec477 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
5 files checked, 0 offenses detected
Everything looks fine. 🍰

@h-kataria h-kataria added this to the Sprint 77 Ending Jan 15, 2018 milestone Jan 3, 2018
@h-kataria h-kataria merged commit e558369 into ManageIQ:master Jan 3, 2018
@lgalis lgalis deleted the cb_dialog_run_return_to_nested_list branch January 4, 2018 00:41
simaishi pushed a commit that referenced this pull request Jan 4, 2018
Fix show record after generic object custom button dialog run
(cherry picked from commit e558369)

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

simaishi commented Jan 4, 2018

Gaprindashvili backport details:

$ git log -1
commit 33ed512683f487cdb4da5324c8a528e73f17323c
Author: Harpreet Kataria <[email protected]>
Date:   Wed Jan 3 17:35:36 2018 -0500

    Merge pull request #2745 from lgalis/cb_dialog_run_return_to_nested_list
    
    Fix show record after generic object custom button dialog run
    (cherry picked from commit e558369544720bbaf710033f9116137d509e4996)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1531311

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants