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

Restrict the Help->Documentation screen based on RBAC rules only #3728

Merged
merged 1 commit into from Apr 8, 2018

Conversation

skateman
Copy link
Member

@skateman skateman commented Apr 6, 2018

The documentation text is visible only for administrators even though the RBAC role can display the menu item for it. In this PR I'm dropping the is_admin? calls from the view and introducing an RBAC check in the controller.

@miq-bot add_label bug, gaprindashvili/yes
@miq-bot add_reviewer @romanblanco

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

@miq-bot
Copy link
Member

miq-bot commented Apr 6, 2018

Checked commit skateman@9aa897b with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. 👍

@martinpovolny martinpovolny merged commit 7e2fffe into ManageIQ:master Apr 8, 2018
@martinpovolny martinpovolny added this to the Sprint 83 Ending Apr 9, 2018 milestone Apr 8, 2018
@martinpovolny martinpovolny self-assigned this Apr 8, 2018
@skateman skateman deleted the rbac-help-menu-support branch April 9, 2018 07:39
@simaishi
Copy link
Contributor

@skateman The BZ has cfme-5.8.z flag too.. Can this be fine/yes?

@skateman
Copy link
Member Author

@miq-bot add_label fine/yes

simaishi pushed a commit that referenced this pull request Apr 18, 2018
Restrict the Help->Documentation screen based on RBAC rules only
(cherry picked from commit 7e2fffe)

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

Fine backport details:

$ git log -1
commit 37080b3ef7fd3c5894e43953ea10b4b1754d10f5
Author: Martin Povolny <mpovolny@redhat.com>
Date:   Sun Apr 8 20:56:20 2018 +0200

    Merge pull request #3728 from skateman/rbac-help-menu-support
    
    Restrict the Help->Documentation screen based on RBAC rules only
    (cherry picked from commit 7e2fffe4334b0a4758cb9dab29fffa8e3b97ff2c)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1569171

@simaishi
Copy link
Contributor

simaishi commented Apr 18, 2018

@skateman Can you take a look at Travis failure in File branch? I think that's coming from backport of this PR....

https://travis-ci.org/ManageIQ/manageiq-ui-classic/jobs/368272457

simaishi pushed a commit that referenced this pull request Apr 19, 2018
Restrict the Help->Documentation screen based on RBAC rules only
(cherry picked from commit 7e2fffe)

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

Gaprindashvili backport details:

$ git log -1
commit 19876412666ff361a5b88e6d44a41a01ac073ec6
Author: Martin Povolny <mpovolny@redhat.com>
Date:   Sun Apr 8 20:56:20 2018 +0200

    Merge pull request #3728 from skateman/rbac-help-menu-support
    
    Restrict the Help->Documentation screen based on RBAC rules only
    (cherry picked from commit 7e2fffe4334b0a4758cb9dab29fffa8e3b97ff2c)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1569170

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.

None yet

4 participants