modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 6 ++++-- modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 275fc7441e3ea61fef5b3abbecf01c9c98713ade Author: Joseph Marques joseph@redhat.com Date: Thu Jul 1 10:57:53 2010 -0400
BZ-608920 - fix sorting on location column of event>history page
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml index a6b25a7..0dd0db8 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml @@ -130,7 +130,7 @@
rich:column <f:facet name="header"> - <onc:sortableColumnHeader sort="location"> + <onc:sortableColumnHeader sort="source.location"> <h:outputText styleClass="headerText" value="Source" /> </onc:sortableColumnHeader> </f:facet>
commit e4b46e67e9dc33ef523d505f94fea84dbef507c0 Author: Joseph Marques joseph@redhat.com Date: Thu Jul 1 01:59:57 2010 -0400
BZ-535692: improve short-cutting logic for alert condition processing
* if an alert definition has been deleted, looking up by alert condition id should return no results * this will prevent downstream out-of-band alert processing from throwing exceptions later
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index 94ae2fe..770c211 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -177,9 +177,11 @@ import org.rhq.core.domain.resource.group.ResourceGroup; + " WHERE aadc.category = :category ) " // + " OR :category IS NULL) "), // @NamedQuery(name = AlertDefinition.QUERY_FIND_DEFINITION_ID_BY_CONDITION_ID, query = "" // - + "SELECT ac.alertDefinition.id " // + + "SELECT ad.id " // + " FROM AlertCondition ac " // - + " WHERE ac.id = :alertConditionId "), // + + " JOIN ac.alertDefinition ad" // + + " WHERE ac.id = :alertConditionId " // + + " AND ad.enabled = true "), // @NamedQuery(name = AlertDefinition.QUERY_IS_ENABLED, query = "" // + "SELECT ad.id " // + " FROM AlertDefinition ad " //