You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/03/30 14:35:30 UTC
svn commit: r1737109 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources:
addPort.html css/common.css js/qpid/management/addPort.js
Author: orudyy
Date: Wed Mar 30 12:35:30 2016
New Revision: 1737109
URL: http://svn.apache.org/viewvc?rev=1737109&view=rev
Log:
QPID-7088: Add ability to set context variables in Port UI
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addPort.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addPort.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addPort.html?rev=1737109&r1=1737108&r2=1737109&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addPort.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addPort.html Wed Mar 30 12:35:30 2016
@@ -278,14 +278,13 @@
</div>
</div>
- <div class="clear">
- <div class="formLabel-controlCell">
+ <div class="clear editorPanel">
<table id="formAddPort.trustStores"
data-dojo-type="dojox.grid.EnhancedGrid"
data-dojo-props="
plugins: {indirectSelection: true},
rowSelector:'0px'"
- style="height: 100px; width:400px"> <!--todo remove -->
+ style="height: 100px;"> <!--todo remove -->
<thead>
<tr>
<th field="name">Name</th>
@@ -294,7 +293,13 @@
</thead>
</table>
</div>
- </div>
+ </div>
+ <div class="editorPanel clear"
+ data-dojo-type="dijit/TitlePane"
+ data-dojo-props="title: 'Context variables', open: false">
+ <div id="formAddPort.context"
+ data-dojo-type="qpid.common.ContextVariablesEditor"
+ data-dojo-props="name: 'context', title: 'Context variables'"></div>
</div>
<input type="hidden" id="formAddPort.id" name="id"/>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1737109&r1=1737108&r2=1737109&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css Wed Mar 30 12:35:30 2016
@@ -323,6 +323,11 @@ div .messages {
margin-right:5px;
}
+.editorPanel
+{
+ margin:5px;
+}
+
.dialogGrid
{
width:100%;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1737109&r1=1737108&r2=1737109&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js Wed Mar 30 12:35:30 2016
@@ -53,6 +53,7 @@ define(["dojo/dom",
/* basic dojox classes */
"dojox/grid/EnhancedGrid",
"dojox/grid/enhanced/plugins/IndirectSelection",
+ "qpid/common/ContextVariablesEditor",
"dojo/domReady!"],
function (dom, construct, win, registry, array, event, json, Memory, ObjectStore, FilteringSelect, domStyle, lang, util, template) {
@@ -161,6 +162,14 @@ define(["dojo/dom",
}
newPort[ propName ] = val;
}
+ else if (propName === "context")
+ {
+ var context = this.context.get("value");
+ if (context && (!this.initialData || !util.equals(context, this.initialData.context)))
+ {
+ newPort["context"] = context;
+ }
+ }
else if(formValues[ propName ] !== "")
{
newPort[ propName ] = formValues[propName];
@@ -245,6 +254,8 @@ define(["dojo/dom",
addPort._prepareForm = function(metadata)
{
+ this.context = dijit.byId("formAddPort.context");
+
//add the port types to formAddPort.type
var portTypeSelect = registry.byId("formAddPort.type");
var supportedPortTypes = metadata.getTypesForCategory("Port");
@@ -466,8 +477,10 @@ define(["dojo/dom",
providerWidget.initialValue = providerWidget.value;
maxOpenConnectionsWidget.initialValue = maxOpenConnectionsWidget.value;
- registry.byId("addPort").show();
util.applyMetadataToWidgets(registry.byId("addPort").domNode, "Port", portType, management.metadata);
+
+ addPort._initContextEditorAndShowDialog(port);
+
}, util.xhrErrorHandler);
}
else
@@ -487,11 +500,53 @@ define(["dojo/dom",
maxOpenConnectionsWidget.set("regExpGen", util.signedOrContextVarRegexp);
editWarning.style.display = "none";
- registry.byId("addPort").show();
-
util.applyMetadataToWidgets(registry.byId("addPort").domNode, "Port", portType, management.metadata);
+
+ this._initContextEditorAndShowDialog();
}
+ };
+ addPort._initContextEditorAndShowDialog = function(actualData)
+ {
+ this.initialData = actualData;
+ if (actualData)
+ {
+ var modelObj = this.modelObj;
+ this.management.load(modelObj ).then( function(effectiveData)
+ {
+ util.setContextData(addPort.context,
+ addPort.management,
+ modelObj,
+ actualData,
+ effectiveData[0],
+ addPort._showDialog);
+ });
+ }
+ else
+ {
+ var modelObj = {type: "broker"};
+ this.management.load(modelObj).then( function(effectiveData)
+ {
+ util.setContextData( addPort.context,
+ addPort.management,
+ modelObj,
+ {},
+ effectiveData[0],
+ function()
+ {
+ addPort.context.setData({},
+ addPort.context.effectiveValues,
+ addPort.context.inheritedActualValues);
+ addPort._showDialog();
+ });
+ });
+ }
+ };
+
+ addPort._showDialog = function()
+ {
+ var dialog = registry.byId("addPort");
+ dialog.show();
};
return addPort;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org