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

Fix custom toolbar explorer #2679

Merged
merged 2 commits into from
Nov 9, 2017
Merged

Fix custom toolbar explorer #2679

merged 2 commits into from
Nov 9, 2017

Conversation

ZitaNemeckova
Copy link
Contributor

@ZitaNemeckova ZitaNemeckova commented Nov 9, 2017 •
edited
Loading

Add custom buttons to User, Group and Tenant(group or single). Those buttons are visible in toolbar.

Clicking on tagging of any of them loads a tagging screen or Add child Tenant to this Tenant for a tenant.
Before:

F, [2017-11-09T13:36:59.580264 #55571] FATAL -- : Error caught: [NoMethodError] undefined method `>=' for nil:NilClass
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:325:in `button_class_name'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:342:in `get_custom_buttons'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:276:in `custom_button_selects'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:306:in `build_custom_toolbar_class'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:296:in `custom_toolbar_class'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:70:in `toolbar_class'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:18:in `build_toolbar'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper/toolbar_builder.rb:6:in `call'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/helpers/application_helper.rb:521:in `build_toolbar'
/Users/zita/Desktop/ManageIQ/manageiq-ui-classic/app/controllers/ops_controller.rb:771:in `choose_custom_toolbar'

After:

Tagging page/New tenant form is loaded.

Try for any tenant Configuration -> Add child Tenant to this Tenant. After adding child Tenant custom button should be visible as it was before.

When x_tree[:tree] == :rbac_tree is not present in custom_toolbar_explorer:

screen shot 2017-11-09 at 1 46 16 pm

When x_tree[:tree] == :rbac_tree is present in custom_toolbar_explorer:

screen shot 2017-11-09 at 1 57 44 pm

There may be some issues on tagging screen that will be fixed by #2667 or #2678 .

Custom buttons functionality is fixed here #2593

@miq_bot add_label bug, gaprindashvili/yes

Closes #2654

@ZitaNemeckova
Remove custom buttons for tagging in OPS
ce2a2fd 
If x_button is fired do not set custom buttons.
@himdel himdel mentioned this pull request Nov 9, 2017
Merged
@ZitaNemeckova
Copy link
Contributor Author

@miq-bot add_label wip

@miq-bot miq-bot changed the title Fix custom toolbar explorer [WIP] Fix custom toolbar explorer Nov 9, 2017
@miq-bot miq-bot added the wip label Nov 9, 2017
@martinpovolny martinpovolny self-assigned this Nov 9, 2017
@ZitaNemeckova
Move custom_toolbar_explorer with :rbac_tree condition to Ops_controller
48c205d 
This is needed for cases such as Adding child tenant
@ZitaNemeckova ZitaNemeckova force-pushed the fix_custom_toolbar_explorer branch from addd4aa to 48c205d Compare November 9, 2017 13:00
@miq-bot
Copy link
Member

miq-bot commented Nov 9, 2017

Checked commits ZitaNemeckova/manageiq-ui-classic@ce2a2fd~...48c205d with ruby 2.3.3, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks fine. 🍰

@ZitaNemeckova
Copy link
Contributor Author

@miq-bot remove_label wip

@miq-bot miq-bot changed the title [WIP] Fix custom toolbar explorer Fix custom toolbar explorer Nov 9, 2017
@miq-bot miq-bot removed the wip label Nov 9, 2017
@martinpovolny martinpovolny merged commit 12ea9c5 into ManageIQ:master Nov 9, 2017
@martinpovolny martinpovolny added this to the Sprint 73 Ending Nov 13, 2017 milestone Nov 9, 2017
@AparnaKarve AparnaKarve mentioned this pull request Nov 9, 2017
Merged
simaishi pushed a commit that referenced this pull request Nov 15, 2017
@martinpovolny @simaishi
Merge pull request #2679 from ZitaNemeckova/fix_custom_toolbar_explorer
dbfdaac 
Fix custom toolbar explorer
(cherry picked from commit 12ea9c5)
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit dbfdaac755f1cf99536af15755ee5dbf6fd6669f
Author: Martin Povolny <[email protected]>
Date:   Thu Nov 9 20:00:33 2017 +0100

    Merge pull request #2679 from ZitaNemeckova/fix_custom_toolbar_explorer
    
    Fix custom toolbar explorer
    (cherry picked from commit 12ea9c5b1c4702b33433281a939a662b4c1f591e)

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

@martinpovolny martinpovolny Awaiting requested review from martinpovolny

Assignees

@martinpovolny martinpovolny

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

Successfully merging this pull request may close these issues.

Custom buttons for Group, User and Tenant broke the tagging of Groups, Users and Tenannt
4 participants
@ZitaNemeckova @miq-bot @simaishi @martinpovolny