You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ma...@apache.org on 2014/09/12 12:27:05 UTC
svn commit: r1624490 - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
Author: macbean
Date: Fri Sep 12 10:27:04 2014
New Revision: 1624490
URL: http://svn.apache.org/r1624490
Log:
QPID-6092: [Java Broker] Editing permitted node list to be allowed when VHN is master or in STOPPED/ERRORED state. UI (2/2)
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1624490&r1=1624489&r2=1624490&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js Fri Sep 12 10:27:04 2014
@@ -38,7 +38,10 @@ define(["qpid/common/util",
{
registry.byId("editVirtualHostNode.storePath").set("disabled", true);
}
-
+ if (!( data.effectiveData.role == "MASTER" || data.data.state == "ERRORED" || data.data.state == "STOPPED"))
+ {
+ registry.byId("editVirtualHostNode.permittedNodesList").set("disabled", true);
+ }
var overrideData = [{id: '0', name: 'Majority', selected: '1'}];
if (node.remotereplicationnodes && node.remotereplicationnodes.length>1)
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1624490&r1=1624489&r2=1624490&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js Fri Sep 12 10:27:04 2014
@@ -156,7 +156,7 @@ define(["dojo/_base/xhr",
{
try
{
- TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData});
+ TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData, effectiveData: effectiveData});
that.form.connectChildren();
util.applyMetadataToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org