Author: orudyy
Date: Fri Apr 1 11:01:45 2016
New Revision: 1737345
URL: http://svn.apache.org/viewvc?rev=1737345&view=rev
Log:
QPID-7086: Add context editors to Authentication and Group Provider UI
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addGroupProvider.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
Fri Apr 1 11:01:45 2016
@@ -50,6 +50,13 @@
</div>
<div class="clear"></div>
<div id="addAuthenticationProvider.typeFields"></div>
+ <div class="editorPanel clear"
+ data-dojo-type="dijit/TitlePane"
+ data-dojo-props="title: 'Context variables',
open: false">
+ <div id="addAuthenticationProvider.context"
+
data-dojo-type="qpid.common.ContextVariablesEditor"
+ data-dojo-props="name: 'context', title:
'Context variables'"></div>
+ </div>
</fieldset>
</div>
</form>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addGroupProvider.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addGroupProvider.html?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addGroupProvider.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addGroupProvider.html
Fri Apr 1 11:01:45 2016
@@ -52,6 +52,13 @@
<div class="clear">
<div id="addGroupProvider.typeFields"></div>
</div>
+ <div class="editorPanel clear"
+ data-dojo-type="dijit/TitlePane"
+ data-dojo-props="title: 'Context variables', open:
false">
+ <div id="addGroupProvider.context"
+
data-dojo-type="qpid.common.ContextVariablesEditor"
+ data-dojo-props="name: 'context', title: 'Context
variables'"></div>
+ </div>
</div>
</form>
<div class="clear">
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
Fri Apr 1 11:01:45 2016
@@ -35,6 +35,7 @@ define([
"dijit/form/Button",
"dojox/grid/EnhancedGrid",
"dojox/grid/enhanced/_Plugin",
+ "dojox/grid/enhanced/plugins/IndirectSelection",
"dijit/form/Select",
"dojox/validate/us",
"dojox/validate/web",
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Fri Apr 1 11:01:45 2016
@@ -755,6 +755,27 @@ define(["dojo/_base/xhr",
util.xhrErrorHandler);
}
+ util.setToBrokerEffectiveContext = function(contextUI, management,
callback )
+ {
+ var brokerModelObj = {type: "broker"};
+ management.load(brokerModelObj,
+ {depth: 0}).then(function(effectiveData)
+ {
+
util.setContextData(contextUI,
+
management,
+
brokerModelObj,
+ {},
+
effectiveData[0],
+
function()
+ {
+ if
(callback)
+ {
+
callback();
+ }
+ });
+ });
+ }
+
util.initialiseFields = function(data, containerNode, metadata,
category, type) {
var attributes = metadata.getMetaData(category,
type).attributes;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
Fri Apr 1 11:01:45 2016
@@ -133,15 +133,9 @@ define(["dojo/parser",
GroupProvider.prototype.editGroupProvider = function()
{
- var management = this.controller.management;
- var that = this;
- management.load(this.modelObj,{ actuals: true }).then(
- function(actualData)
- {
- addGroupProvider.show(management, that.modelObj,
actualData[0]);
- },
- util.xhrErrorHandler
- );
+ addGroupProvider.show(this.controller.management,
+ this.modelObj,
+
this.groupProviderUpdater.groupProviderData);
}
function GroupProviderUpdater(groupProviderTab)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
Fri Apr 1 11:01:45 2016
@@ -45,6 +45,7 @@ define(["dojo/dom",
/* basic dojox classes */
"dojox/form/BusyButton", "dojox/form/CheckedMultiSelect",
"dojox/layout/TableContainer",
+ "qpid/common/ContextVariablesEditor",
"dojo/domReady!"],
function (dom, construct, win, registry, parser, array, event, json,
Memory, FilteringSelect, connect, domStyle, util, template)
{
@@ -78,6 +79,7 @@ define(["dojo/dom",
this.preferencesProviderForm = new
qpid.preferencesprovider.PreferencesProviderForm({disabled: true});
this.preferencesProviderForm.placeAt(dom.byId("addPreferencesProvider.form"));
+ this.context =
registry.byId("addAuthenticationProvider.context");
},
show:function(management, modelObj, effectiveData)
{
@@ -91,10 +93,10 @@ define(["dojo/dom",
var authenticationProviderTypeStore =
util.makeTypeStore(this.supportedAuthenticationProviderTypes);
this.authenticationProviderType.set("store",
authenticationProviderTypeStore);
+ var that = this;
if (effectiveData)
{
// editing
- var that = this;
management.load(modelObj, { actuals: true }).then(
function(data)
{
@@ -115,7 +117,12 @@ define(["dojo/dom",
that.preferencesProviderForm.setPreferencesProviderName(actualData.name);
}
that.authenticationProviderName.set("value", actualData.name);
- that._show();
+ util.setContextData(that.context,
+ management,
+ modelObj,
+ actualData,
+ effectiveData,
+
function(){that._show();});
});
}
else
@@ -125,7 +132,7 @@ define(["dojo/dom",
this.authenticationProviderName.set("disabled", false);
this.initialData = {};
this.effectiveData = {};
- this._show();
+ util.setToBrokerEffectiveContext(this.context, management,
function(){that._show();});
}
},
_show: function()
@@ -152,7 +159,11 @@ define(["dojo/dom",
if(this.authenticationProviderForm.validate() &&
this.preferencesProviderForm.validate())
{
var authenticationProviderData =
util.getFormWidgetValues(this.authenticationProviderForm, this.initialData);
-
+ var context = this.context.get("value");
+ if (context && (!this.initialData || !util.equals(context,
this.initialData.context)))
+ {
+ authenticationProviderData["context"] = context;
+ }
var that = this;
var hideDialog = function(x)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
Fri Apr 1 11:01:45 2016
@@ -71,12 +71,12 @@ define([
this.groupProviderType =
registry.byId("addGroupProvider.type");
this.groupProviderType.on("change",
function(type){that._groupProviderTypeChanged(type);});
+ this.context = registry.byId("addGroupProvider.context");
},
- show: function(management, modelObj, actualData)
+ show: function(management, modelObj, effectiveData)
{
this.management = management;
this.modelObj = modelObj;
- this.initialData = lang.clone(actualData);
this.groupProviderForm.reset();
var supportedTypes =
management.metadata.getTypesForCategory("GroupProvider");
@@ -84,15 +84,40 @@ define([
var supportedTypesStore = util.makeTypeStore(supportedTypes);
this.groupProviderType.set("store", supportedTypesStore);
- if (actualData)
+ if (effectiveData)
{
this._destroyTypeFields(this.containerNode);
- this._initFields(actualData);
+ var that = this;
+ management.load(modelObj,
+ {actuals: true,
depth:0}).then(function(data)
+ {
+ var
actualData = data[0];
+
that.initialData = lang.clone(actualData);
+
that._initFields(actualData);
+
+
that.groupProviderName.set("disabled", true);
+
that.groupProviderType.set("disabled", true);
+
that.dialog.set("title", "Edit Group Provider - " + effectiveData.name);
+
+
util.setContextData(that.context,
+
management,
+
modelObj,
+
actualData,
+
effectiveData,
+
function(){that.dialog.show();});
+ });
+ }
+ else
+ {
+ this.initialData = null;
+ this.groupProviderName.set("disabled", false );
+ this.groupProviderType.set("disabled", false );
+ this.dialog.set("title", "Add Group Provider" );
+ util.setToBrokerEffectiveContext(this.context,
+ management,
+ lang.hitch(this.dialog,
this.dialog.show));
}
- this.groupProviderName.set("disabled", actualData == null ?
false : true);
- this.groupProviderType.set("disabled", actualData == null ?
false : true);
- this.dialog.set("title", actualData == null ? "Add Group
Provider" : "Edit Group Provider - " + actualData.name);
- this.dialog.show();
+
},
_initFields:function(data)
{
@@ -122,7 +147,11 @@ define([
if (this.groupProviderForm.validate())
{
var groupProviderData =
util.getFormWidgetValues(this.groupProviderForm, this.initialData);
-
+ var context = this.context.get("value");
+ if (context && (!this.initialData || !util.equals(context,
this.initialData.context)))
+ {
+ groupProviderData["context"] = context;
+ }
var that = this;
if (this.initialData)
@@ -132,7 +161,7 @@ define([
}
else
{
- this.management.create("groupprovider",
this.modelObj,groupProviderData).then( function(x){that.dialog.hide();});
+ this.management.create("groupprovider", this.modelObj,
groupProviderData).then( function(x){that.dialog.hide();});
}
}
else
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=1737345&r1=1737344&r2=1737345&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
Fri Apr 1 11:01:45 2016
@@ -542,22 +542,7 @@ define(["dojo/dom",
}
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();
- });
- });
+ util.setToBrokerEffectiveContext(addPort.context,
addPort.management, addPort._showDialog);
}
};
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/show.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/show.js
Fri Apr 1 11:01:45 2016
@@ -25,7 +25,6 @@ define(["qpid/common/util", "dojo/domRea
function Base64MD5PasswordFile(data)
{
util.buildUI(data.containerNode, data.parent,
"authenticationprovider/filebased/show.html", ["path"], this);
- data.parent.editButton.set("disabled", false);
}
Base64MD5PasswordFile.prototype.update = function(data)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/show.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/show.js
Fri Apr 1 11:01:45 2016
@@ -25,7 +25,6 @@ define(["qpid/common/util", "dojo/domRea
function External(data)
{
util.buildUI(data.containerNode, data.parent,
"authenticationprovider/external/show.html", ["useFullDN"], this);
- data.parent.editButton.set("disabled", false);
}
External.prototype.update = function(data)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js
Fri Apr 1 11:01:45 2016
@@ -30,7 +30,6 @@ define(["qpid/common/util",
function AuthenticationProvider(params)
{
util.buildUI(params.containerNode, params.parent,
"authenticationprovider/oauth2/show.html", fieldNames, this);
- params.parent.editButton.set("disabled", false);
}
AuthenticationProvider.prototype.update = function(restData)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/show.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/show.js
Fri Apr 1 11:01:45 2016
@@ -25,7 +25,6 @@ define(["qpid/common/util", "dojo/domRea
function PlainPasswordFile(data)
{
util.buildUI(data.containerNode, data.parent,
"authenticationprovider/filebased/show.html", ["path"], this);
- data.parent.editButton.set("disabled", false);
}
PlainPasswordFile.prototype.update = function(data)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/show.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/show.js
Fri Apr 1 11:01:45 2016
@@ -30,7 +30,6 @@ define(["qpid/common/util", "dojo/domRea
this.fields.push(name);
}
util.buildUI(data.containerNode, data.parent,
"authenticationprovider/simpleldap/show.html", this.fields, this);
- data.parent.editButton.set("disabled", false);
}
SimpleLdapAuthenticationProvider.prototype.update = function(data)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js
Fri Apr 1 11:01:45 2016
@@ -31,7 +31,6 @@ define(["qpid/common/util",
{
this.containerNode = params.containerNode;
util.buildUI(params.containerNode, params.parent,
"groupprovider/cloudfoundrydashboardmanagement/show.html", fieldNames, this);
- params.parent.editButton.set("disabled", false);
}
GroupProvider.prototype.update = function(restData)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
Fri Apr 1 11:01:45 2016
@@ -35,7 +35,7 @@
<div class="clear authenticationProviderDetails"></div>
<div class="clear"></div>
<div class="clear dijitDialogPaneActionBar">
- <button data-dojo-type="dijit.form.Button"
class="editAuthenticationProviderButton" type="button"
data-dojo-props="disabled: true">Edit</button>
+ <button data-dojo-type="dijit.form.Button"
class="editAuthenticationProviderButton" type="button">Edit</button>
<button data-dojo-type="dijit.form.Button"
class="deleteAuthenticationProviderButton" type="button">Delete</button>
</div>
</div>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html?rev=1737345&r1=1737344&r2=1737345&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
Fri Apr 1 11:01:45 2016
@@ -37,7 +37,7 @@
<div class="providerDetails"></div>
<br/>
<div class="dijitDialogPaneActionBar">
- <input class="editGroupProviderButton" type="button" value="Edit"
label="Edit" data-dojo-type="dijit.form.Button"
data-dojo-props="disabled:true"/>
+ <input class="editGroupProviderButton" type="button" value="Edit"
label="Edit" data-dojo-type="dijit.form.Button"/>
<input class="deleteGroupProviderButton" type="button"
value="Delete" label="Delete" data-dojo-type="dijit.form.Button" />
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
