modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
| 12 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit ad3703f5f88f547d397dc3612647970c8621b238
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Oct 1 18:55:27 2013 +0200
[BZ 958169] - Modified alert definition is not saved on confirming the save message
after clicking on 'Back to List' button - overriding the behavior of destroy
method of the enhanced layout, because this class needs to get the data from child
components before the destroy() is called. This was causing various JavaScript
exceptions.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
index d501787..379e83d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
@@ -261,5 +261,4 @@ public class GeneralPropertiesAlertDefinitionForm extends DynamicForm
implements
public boolean validate() {
return super.validate() && nameField.validate();
}
-
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
index e24d1b4..9457e48 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
@@ -64,12 +64,23 @@ public class SingleAlertDefinitionView extends EnhancedVLayout {
private TabSet tabSet;
private Tab generalPropertiesTab;
private HandlerRegistration handlerRegistration;
+ private boolean needsCleanup = false;
private boolean isAuthorizedToModifyAlertDefinitions;
public SingleAlertDefinitionView(AbstractAlertDefinitionsView alertDefView) {
this(alertDefView, null);
}
+
+ @Override
+ public void destroy() {
+ if (handlerRegistration == null) { // the leaving dialog has been answered
+ super.destroy();
+ needsCleanup = false;
+ } else {
+ needsCleanup = true;
+ }
+ }
public SingleAlertDefinitionView(final AbstractAlertDefinitionsView alertDefView,
AlertDefinition alertDefinition) {
super();
@@ -285,6 +296,7 @@ public class SingleAlertDefinitionView extends EnhancedVLayout {
if (handlerRegistration != null) {
handlerRegistration.removeHandler();
handlerRegistration = null;
+ if (needsCleanup) destroy();
}
}
}
Show replies by date