modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java
| 13 ++++++----
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 66626bda5661e8ed889e8e3269dcb083346cd8c5
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Feb 15 16:10:56 2011 -0500
on group Monitor > Schedules subtab, only show metric schedules for explicit group
members (
https://bugzilla.redhat.com/show_bug.cgi?id=676762)
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java
index 3a2b130..9bd7e1f 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java
@@ -51,9 +51,12 @@ public class MeasurementScheduleCriteria extends Criteria {
public static final String SORT_FIELD_DATA_TYPE = "dataType";
// filter fields
+ public static final String FILTER_FIELD_DEFINITION_IDS = "definitionIds";
public static final String FILTER_FIELD_RESOURCE_ID = "resourceId";
public static final String FILTER_FIELD_RESOURCE_GROUP_ID =
"resourceGroupId";
public static final String FILTER_FIELD_RESOURCE_TYPE_ID =
"resourceTypeId";
+ public static final String FILTER_FIELD_AUTO_GROUP_RESOURCE_TYPE_ID =
"autoGroupResourceTypeId";
+ public static final String FILTER_FIELD_AUTO_GROUP_PARENT_RESOURCE_ID =
"autoGroupParentResourceId";
private Integer filterId;
private Boolean filterEnabled;
@@ -73,19 +76,19 @@ public class MeasurementScheduleCriteria extends Criteria {
private PageOrdering sortDataType; // requires overrides
public MeasurementScheduleCriteria() {
- filterOverrides.put("definitionIds", "definition.id IN ( ?
)");
+ filterOverrides.put(FILTER_FIELD_DEFINITION_IDS, "definition.id IN ( ?
)");
filterOverrides.put(FILTER_FIELD_RESOURCE_ID, "resource.id IN ( ? )");
filterOverrides.put(FILTER_FIELD_RESOURCE_GROUP_ID, "resource.id IN "
//
+ "( SELECT res.id " //
+ " FROM Resource res " //
- + " JOIN res.implicitGroups ig " //
- + " WHERE ig.id = ? )");
- filterOverrides.put("autoGroupResourceTypeId", "resource.id IN
" //
+ + " JOIN res.explicitGroups eg " //
+ + " WHERE eg.id = ? )");
+ filterOverrides.put(FILTER_FIELD_AUTO_GROUP_RESOURCE_TYPE_ID, "resource.id
IN " //
+ "( SELECT res.id " //
+ " FROM Resource res " //
+ " JOIN res.resourceType type " //
+ " WHERE type.id = ? )");
- filterOverrides.put("autoGroupParentResourceId", "resource.id IN
" //
+ filterOverrides.put(FILTER_FIELD_AUTO_GROUP_PARENT_RESOURCE_ID, "resource.id
IN " //
+ "( SELECT res.id " //
+ " FROM Resource res " //
+ " JOIN res.parentResource parent " //