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

[Gaprindashvili] Backport Admin report and request roles #17858

Closed
wants to merge 7 commits into from

Conversation

kbrock
Copy link
Member

@kbrock kbrock commented Aug 14, 2018

This PR manually backports to G:

There were conflicts (especially in filterer and miq_user_role) since #17768 was applied before this PR

Followup PRs to backport:

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

@kbrock kbrock force-pushed the bz_1608554-g branch 3 times, most recently from ac7fe9c to 3eaa5b6 Compare August 15, 2018 19:29
Jillian Tullo and others added 7 commits August 16, 2018 13:07
move hardcoded admin logic over to rbac
Admins have 2 types of escalated privileges
report and request

This separates the types (with 2 different product features)
We introduced feature miq_request_superadmin in f6c02e8 / ManageIQ#17444
The feature miq_request_approval already existed.
Merging the 2 together.

This fixes an inconsistency between API and UI
The issue existed before this feature was introduced
so this works with 17444 to fix the BZ

ManageIQ#17444
https://bugzilla.redhat.com/show_bug.cgi?id=1608554
@miq-bot
Copy link
Member

miq-bot commented Aug 16, 2018

Checked commits kbrock/manageiq@d565727~...ce98d6e with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
13 files checked, 0 offenses detected
Everything looks fine. 🍪

@kbrock kbrock closed this Aug 22, 2018
@kbrock kbrock deleted the bz_1608554-g branch August 22, 2018 18:30
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.

2 participants