modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/EditAlertDefinitionForm.java | 5 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 25 ++++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java | 1 modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_end.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_start.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_stretch.png |binary 6 files changed, 22 insertions(+), 9 deletions(-)
New commits: commit 9a040dd824209eb9e71bb22c7cf7d80a7c468485 Author: Jirka Kremser jkremser@redhat.com Date: Fri May 17 12:41:31 2013 +0200
[BZ 958169] - Modified alert definition is not saved on confirming the save message after clicking on 'Back to List' button - Making the "Back to List" button disabled when editing the alert definition.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/EditAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/EditAlertDefinitionForm.java index 14b6abf..d915cb0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/EditAlertDefinitionForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/EditAlertDefinitionForm.java @@ -1,8 +1,5 @@ package org.rhq.enterprise.gui.coregui.client.alert.definitions;
-import java.util.Map; - -import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertDefinition;
/** @@ -12,8 +9,6 @@ public interface EditAlertDefinitionForm {
AlertDefinition getAlertDefinition();
-// Map<Integer, AlertCondition> getUpdatedAlertConditions(); - boolean isResetMatching();
void setAlertDefinition(AlertDefinition alertDef); 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 b4504c9..c86d0cd 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 @@ -28,6 +28,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.util.BooleanCallback; import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.Button; +import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.events.VisibilityChangedEvent; @@ -145,7 +146,10 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { cancelButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - handlerRegistration.removeHandler(); + if (handlerRegistration != null) + handlerRegistration.removeHandler(); + // enable the back button + ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(false); setAlertDefinition(getAlertDefinition()); // reverts data back to original makeViewOnly(); } @@ -193,6 +197,8 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { recovery.makeEditable(); dampening.makeEditable();
+ if (handlerRegistration != null) + handlerRegistration.removeHandler(); handlerRegistration = addVisibilityChangedHandler(new VisibilityChangedHandler() { public void onVisibilityChanged(VisibilityChangedEvent event) { if (!event.getIsVisible()) { @@ -201,12 +207,15 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { if (value) { save(); } - handlerRegistration.removeHandler(); + if (handlerRegistration != null) + handlerRegistration.removeHandler(); } }); } } }); + // disable the back button + ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(true); }
public void makeViewOnly() { @@ -240,13 +249,21 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { new AsyncCallback<AlertDefinition>() { @Override public void onSuccess(final AlertDefinition alertDef) { - handlerRegistration.removeHandler(); + if (handlerRegistration != null) + handlerRegistration.removeHandler(); setAlertDefinition(alertDef); + // enable the back button + ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(false); }
@Override public void onFailure(Throwable caught) { - // nothing, the notification is done in the subclasses of AbstractAlertDefinitionsView + if (handlerRegistration != null) + handlerRegistration.removeHandler(); + // enable the back button + ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(false); + + // no error handling, the notification is done in the subclasses of AbstractAlertDefinitionsView } }); } else { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java index efab26d..41819e1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java @@ -41,6 +41,7 @@ public class BackButton extends StretchImgButton { public BackButton(String title, final String anchor) { this(); setTitle("<b>" + title + "</b>"); + setID("backButton"); addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { CoreGUI.goToView(anchor); diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_end.png b/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_end.png new file mode 100644 index 0000000..c323816 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_end.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_start.png b/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_start.png new file mode 100644 index 0000000..d6cf484 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_start.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_stretch.png b/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_stretch.png new file mode 100644 index 0000000..2addd3a Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Disabled_stretch.png differ
rhq-commits@lists.fedorahosted.org