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

Revert "Merge pull request #15367" #17322

Merged
merged 1 commit into from
Apr 20, 2018
Merged

Revert "Merge pull request #15367" #17322

merged 1 commit into from
Apr 20, 2018

Conversation

lpichler
Copy link
Contributor

revert of #15367

Why ?

Based on users's feedback in BZs.

Links

https://bugzilla.redhat.com/show_bug.cgi?id=1568013 (main)
https://bugzilla.redhat.com/show_bug.cgi?id=1554775

@miq-bot assign @gtanzillo

@miq-bot add_label bug, rbac

@lpichler
Revert "Merge pull request ManageIQ#15367 from lpichler/make_user_fil…
2d9d8bc 
…ter_as_restriction"

This reverts commit ed5da67, reversing
changes made to ed707ba.
@miq-bot
Copy link
Member

miq-bot commented Apr 20, 2018

Checked commit lpichler@2d9d8bc with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 🏆

@kbrock
Copy link
Member

kbrock commented Apr 20, 2018

Libor - can we talk about these.
I've been trying to remove the separate querying, and get these into the main query.
So I'd like to make sure this is as sql friendly as posisble

@kbrock kbrock merged commit 9f8c439 into ManageIQ:master Apr 20, 2018
@kbrock kbrock self-assigned this Apr 20, 2018
@kbrock kbrock added this to the Sprint 84 Ending Apr 23, 2018 milestone Apr 20, 2018
simaishi pushed a commit that referenced this pull request Apr 20, 2018
@kbrock @simaishi
Merge pull request #17322 from lpichler/revert_make_user_filter_as_re…
4347128 
…striction

Revert "Merge pull request #15367"
(cherry picked from commit 9f8c439)

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

Gaprindashvili backport details:

$ git log -1
commit 4347128c7f564223941c1f60367faf225f6cd4a5
Author: Keenan Brock <[email protected]>
Date:   Fri Apr 20 12:04:57 2018 -0400

    Merge pull request #17322 from lpichler/revert_make_user_filter_as_restriction
    
    Revert "Merge pull request #15367"
    (cherry picked from commit 9f8c439882b88b6dc0866d74c0df29c168cdaca7)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1570118

@lpichler lpichler deleted the revert_make_user_filter_as_restriction branch April 23, 2018 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kbrock kbrock

@gtanzillo gtanzillo

Labels
blocker bug core/rbac gaprindashvili/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lpichler @miq-bot @kbrock @simaishi @gtanzillo