modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/Authorization.java
| 12 +++++-----
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 3c32f3404771987a7c40548a71408190ca044867
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Feb 18 13:01:56 2011 +0100
BZ 678551 - fixing the authz logic in the hq:authorization JSP tag.
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/Authorization.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/Authorization.java
index ae3164d..a8e5d07 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/Authorization.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/Authorization.java
@@ -56,19 +56,19 @@ public class Authorization extends ConditionalTagSupport {
}
Context context = Context.Global;
- int objectId = getResourceId(request);
- if (objectId != 0) {
+ int resourceId = getResourceId(request);
+ if (resourceId != 0) {
context = Context.Resource;
}
- objectId = getResourceGroupId(request);
- if (objectId != 0) {
+ int groupId = getResourceGroupId(request);
+ if (groupId != 0) {
context = Context.Group;
}
if (context == Context.Resource) {
- return authorizationManager.hasResourcePermission(user, permission,
objectId);
+ return authorizationManager.hasResourcePermission(user, permission,
resourceId);
} else if (context == Context.Group) {
- return authorizationManager.hasGroupPermission(user, permission,
objectId);
+ return authorizationManager.hasGroupPermission(user, permission,
groupId);
} else if (context == Context.Global) {
return authorizationManager.hasGlobalPermission(user, permission);
} else {
Show replies by date