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

Add default tab for first selected group after login #680

Merged
merged 1 commit into from
Mar 14, 2017

Conversation

ZitaNemeckova
Copy link
Contributor

Introduced by #379
https://bugzilla.redhat.com/show_bug.cgi?id=1421196

Log in -> Configuration -> Access control (has to be first time after login) -> choose a group (Do not select Groups node beforehand)

Before:
screen shot 2017-03-14 at 2 09 55 pm

After:
screen shot 2017-03-14 at 2 08 11 pm

@miq-bot assign @himdel

@miq-bot add_label bug, trees, euwe/yes
(Darga version has it already fixed)

@miq-bot
Copy link
Member

miq-bot commented Mar 14, 2017

Checked commit ZitaNemeckova@1905cc3 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
1 file checked, 0 offenses detected
Everything looks good. 🍰

@himdel himdel closed this Mar 14, 2017
@himdel himdel reopened this Mar 14, 2017
@himdel
Copy link
Contributor

himdel commented Mar 14, 2017

LGTM, tested in the UI, waiting for travis to go green..

@himdel himdel merged commit ac2683d into ManageIQ:master Mar 14, 2017
@himdel himdel added this to the Sprint 57 Ending Mar 27, 2017 milestone Mar 14, 2017
@simaishi
Copy link
Contributor

@ZitaNemeckova This is giving a conflict on backport. node[0] to node.last change was in #379. PR 379 was backported via ManageIQ/manageiq#14227, but PR 14227 didn't include this node change, so I'm not sure if this was on purpose..

If this PR can go in as is, I'll resolve the conflict during backport. Let me know.

$ git diff
diff --cc app/controllers/ops_controller.rb
index a3c3d99,f5104e5..0000000
--- a/app/controllers/ops_controller.rb
+++ b/app/controllers/ops_controller.rb
@@@ -354,9 -349,8 +354,13 @@@ class OpsController < ApplicationContro
        end
      when :rbac_tree
        @sb[:active_tab] = "rbac_details"
 +
        # default to the first tab in group detail
++<<<<<<< HEAD
 +      @sb[:active_rbac_group_tab] ||= "rbac_customer_tags" if node[0] == 'g'
++=======
+       @sb[:active_rbac_group_tab] ||= "rbac_customer_tags" if node.last == 'g' || node.first == 'g'
++>>>>>>> ac2683d... Merge pull request #680 from ZitaNemeckova/fix_group_tree
      when :diagnostics_tree
        case node[0]
        when "root"

@ZitaNemeckova
Copy link
Contributor Author

@simaishi It should go in as is. Thanks :)

@simaishi
Copy link
Contributor

Euwe backport (to manageiq repo) details:

$ git log -1
commit ece9840ceca69387ff34f68f0a10e571e8d1262c
Author: Martin Hradil <[email protected]>
Date:   Tue Mar 14 15:09:25 2017 +0000

    Merge pull request #680 from ZitaNemeckova/fix_group_tree
    
    Add default tab for first selected group after login
    (cherry picked from commit ac2683d59d74c661b559aaf637af5cb1f733fc7a)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1427321

@ZitaNemeckova ZitaNemeckova deleted the fix_group_tree branch September 12, 2017 15:00
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.

4 participants