modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cc6a7e254ceda81dc32042746924cdc42062d6dd
Author: Joseph Marques <joseph(a)redhat.com>
Date: Tue Jan 4 13:22:19 2011 -0500
move config-read authz checking for resource-based search translation to appropriate
branch
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 2ff8209..b60c61b 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
@@ -99,7 +99,6 @@ public class ResourceSearchTranslator extends AbstractSearchTranslator
{
+ " WHERE simpleDefinition = definition " // only provide
translations for simple properties
+ " AND simpleDefinition.type <> 'PASSWORD'
" // do not allow searching by hidden/password fields
+ " AND property = simple " // join to simple for filter
by 'stringValue' attribute
- + conditionallyAddAuthzFragment(getConfigAuthzFragment()) //
+ " AND " + getJPQLForString("definition.name",
RHQLComparisonOperator.EQUALS, param) //
+ " AND " +
getJPQLForString("simple.stringValue", op, filter));
@@ -112,6 +111,7 @@ public class ResourceSearchTranslator extends AbstractSearchTranslator
{
+ " WHERE simpleDefinition = definition " // only provide
translations for simple properties
+ " AND simpleDefinition.type <> 'PASSWORD'
" // do not allow searching by hidden/password fields
+ " AND property = simple " // join to simple for filter
by 'stringValue' attribute
+ + conditionallyAddAuthzFragment(getConfigAuthzFragment()) //
+ " AND " + getJPQLForString("definition.name",
RHQLComparisonOperator.EQUALS, param) //
+ " AND " +
getJPQLForString("simple.stringValue", op, filter));
Show replies by date