Tomas Jelinek has uploaded a new change for review.
Change subject: userportal: ignore the NetworkUser role
......................................................................
userportal: ignore the NetworkUser role
Since 97e84c622a7cfa9f709eb4d814d42d90448edc91 there is a
NetworkUser role and this role is assigned to everyone.
Since the engineUser does not contain this role, UP
evaluates, that this specific user has more roles than the
engineUser so he is an admin and should see the extended tab.
Fixed by ignoring the NetworkUser in this algorithm
the same way as e.g. the QuotaConsumer is.
Change-Id: Iaf696b51159ba016d88124b789d5bbbab7b736fe
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/12526/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java
index 9e2e1a4..c07cb99 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/auth/ApplicationGuids.java
@@ -13,6 +13,7 @@
userTemplateBasedVM(new Guid("def00009-0000-0000-0000-def000000009")),
//$NON-NLS-1$
quotaConsumer(new Guid("def0000a-0000-0000-0000-def00000000a")),
//$NON-NLS-1$
dataCenterAdmin(new Guid("def00002-0000-0000-0000-def000000002")),
//$NON-NLS-1$
+ networkUser(new Guid("DEF0000A-0000-0000-0000-DEF000000010")),
//$NON-NLS-1$
// ad_groups
everyone(new Guid("eee00000-0000-0000-0000-123456789eee")); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
index 350d57c..388d114 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
@@ -316,8 +316,10 @@
// ignore:
// ALL Everyone/UserPoralBasedVM permissions and
// ALL Everyone/QuotaConsumer persmissions
+ // ALL Everyone/NetworkUser persmissions
if
(isEveyoneUserPortalBasedVmPermission(permission)
- ||
isEveryoneQuotaConsumerPermission(permission)) {
+ ||
isEveryoneQuotaConsumerPermission(permission)
+ ||
isEveyoneNetworUserPermission(permission)) {
continue;
}
if (!roleIdList.contains(permission.getrole_id()))
@@ -339,6 +341,11 @@
}
+ private boolean isEveyoneNetworUserPermission(permissions
permission) {
+ return
permission.getad_element_id().getValue().equals(ApplicationGuids.everyone.asGuid())
&&
+
permission.getrole_id().getValue().equals(ApplicationGuids.networkUser.asGuid());
+ }
+
private boolean
isEveyoneUserPortalBasedVmPermission(permissions permission) {
return
permission.getad_element_id().getValue().equals(ApplicationGuids.everyone.asGuid())
&&
--
To view, visit http://gerrit.ovirt.org/12526
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf696b51159ba016d88124b789d5bbbab7b736fe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
