modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 14 +++++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
| 14 +++++++---
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 4 +-
3 files changed, 23 insertions(+), 9 deletions(-)
New commits:
commit 4246288e0100247352a369d309e7e4a037c5d6e7
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Mar 1 13:33:33 2011 -0500
redirect to config history subtab after a successful resource config update, and also
include the config update id (i.e. "version") in the success message
(
https://bugzilla.redhat.com/show_bug.cgi?id=640270)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 0f712a6..576f102 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -83,6 +83,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
public static class Tab {
public static final String OPERATIONS = "Operations";
+ public static final String CONFIGURATION = "Configuration";
// TODO: other tabs
}
@@ -91,6 +92,11 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
public static final String HISTORY = "History";
}
+ public static class ConfigurationSubTab {
+ public static final String CURRENT = "Current";
+ public static final String HISTORY = "History";
+ }
+
private Integer resourceId;
private ResourceComposite resourceComposite;
@@ -209,11 +215,13 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
operationsTab.registerSubTabs(this.operationsSchedules, this.operationsHistory);
tabs.add(operationsTab);
- configurationTab = new
TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new
ViewName("Configuration",
+ configurationTab = new
TwoLevelTab(getTabSet().extendLocatorId(Tab.CONFIGURATION), new
ViewName(Tab.CONFIGURATION,
MSG.view_tabs_common_configuration()),
"/images/icons/Configure_grey_16.png");
- this.configCurrent = new
SubTab(configurationTab.extendLocatorId("Current"), new
ViewName("Current", MSG
+ this.configCurrent = new
SubTab(configurationTab.extendLocatorId(ConfigurationSubTab.CURRENT),
+ new ViewName(ConfigurationSubTab.CURRENT, MSG
.view_tabs_common_current()), null);
- this.configHistory = new
SubTab(configurationTab.extendLocatorId("History"), new
ViewName("History", MSG
+ this.configHistory = new
SubTab(configurationTab.extendLocatorId(ConfigurationSubTab.HISTORY),
+ new ViewName(ConfigurationSubTab.HISTORY, MSG
.view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
index 0700b78..6f207ba 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
@@ -35,11 +35,13 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.RefreshableView;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeEvent;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeListener;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceDetailView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.MetadataType;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypeLoadedCallback;
@@ -151,10 +153,14 @@ public class ResourceConfigurationEditView extends LocatableVLayout
implements P
}
public void onSuccess(ResourceConfigurationUpdate result) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_configurationDetails_messageConcise(), MSG
-
.view_configurationDetails_messageDetailed(resource.getName()), Message.Severity.Info));
- refresh();
+ String version = String.valueOf(result.getId());
+ Message message = new
Message(MSG.view_configurationDetails_messageConcise(version), MSG
+ .view_configurationDetails_messageDetailed(version,
resource.getName()),
+ Message.Severity.Info);
+ String configHistoryUrl =
LinkManager.getResourceTabLink(resource.getId(),
+ ResourceDetailView.Tab.CONFIGURATION,
ResourceDetailView.ConfigurationSubTab.HISTORY);
+ String configHistoryView = configHistoryUrl.substring(1);
+ CoreGUI.goToView(configHistoryView, message);
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index a4e822f..f6d806d 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1798,8 +1798,8 @@ view_resourceResourceGroupList_message_updateSuccess = Group
membership updated
#-------------------------------
view_configurationDetails_noPermission = You do not have permission to edit this
Resource''s configuration.
view_configurationDetails_error_updateFailure = Failed to update configuration.
-view_configurationDetails_messageConcise = Configuration updated.
-view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].
+view_configurationDetails_messageConcise = Configuration updated - current version is
{0}).
+view_configurationDetails_messageDetailed = Configuration updated to version {0} for
Resource [{1}].
view_configurationDetails_allPropertiesValid = All configuration properties have valid
values, so the configuration can now be saved.
view_configurationDetails_somePropertiesInvalid = The following configuration properties
have invalid values: {0}. The values must be corrected before the configuration can be
saved.