modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
| 3 ++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
| 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e6e087fd65eef3b4e3ad9888573ab73652d378f6
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 4 13:45:41 2011 -0500
we want this to restrict on configure_READ, not _WRITE perm
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
index 9bf266b..b16270d 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.search.SearchSubsystem;
@@ -226,7 +227,7 @@ public class ResourceSearchAssistant extends TabAwareSearchAssistant
{
+ " JOIN irole.subjects isubject " //
+ " JOIN irole.permissions iperm " //
+ " WHERE isubject.id = " + getSubjectId() //
- + " AND iperm = 11)";
+ + " AND iperm = " + Permission.CONFIGURE_READ.ordinal() +
")";
}
private String getAuthzFragment() {
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
index b60c61b..d411efb 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
@@ -22,6 +22,7 @@ import static
org.rhq.enterprise.server.search.common.SearchQueryGenerationUtili
import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.search.assist.AlertSearchAssistParam;
@@ -133,7 +134,7 @@ public class ResourceSearchTranslator extends AbstractSearchTranslator
{
+ " JOIN irole.subjects isubject " //
+ " JOIN irole.permissions iperm " //
+ " WHERE isubject.id = " + getSubjectId() //
- + " AND iperm = 11)";
+ + " AND iperm = " + Permission.CONFIGURE_READ.ordinal() +
")";
}
}
Show replies by date