Author: orudyy
Date: Wed Dec 3 12:17:32 2014
New Revision: 1643103
URL: http://svn.apache.org/r1643103
Log:
QPID-6246: Various fixes for preferences provider UI
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
- copied, changed from r1643087,
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/filesystempreferences/show.html
- copied, changed from r1643087,
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
Removed:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html?rev=1643103&r1=1643102&r2=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
Wed Dec 3 12:17:32 2014
@@ -54,7 +54,7 @@
</div>
</form>
- <div id="addPreferencesProvider.form"
xxx-data-dojo-type="qpid/management/preferencesprovider/PreferencesProviderForm"></div>
+ <div id="addPreferencesProvider.form"></div>
</div>
<div class="dijitDialogPaneActionBar">
<button data-dojo-type="dijit/form/Button"
id="addAuthenticationProvider.addButton" data-dojo-props="label: 'Save'"
type="submit"></button>
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1643103&r1=1643102&r2=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Wed Dec 3 12:17:32 2014
@@ -173,7 +173,7 @@ define(["dojo/_base/xhr",
if (!this.preferencesProvider)
{
var preferencesProvider =new
PreferencesProvider(preferencesProviderData.name, this.authProviderData);
- preferencesProvider.init(this.preferencesNode);
+ preferencesProvider.init(this.preferencesNode, this);
this.preferencesProvider = preferencesProvider;
}
this.preferencesProvider.update(preferencesProviderData);
@@ -188,6 +188,11 @@ define(["dojo/_base/xhr",
}
};
+ AuthProviderUpdater.prototype.onPreferencesProviderDeleted =
function()
+ {
+ this.preferencesProvider = null;
+ }
+
AuthProviderUpdater.prototype.updateHeader = function()
{
this.authenticationProvider.name = this.authProviderData[
"name" ]
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1643103&r1=1643102&r2=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
Wed Dec 3 12:17:32 2014
@@ -21,7 +21,8 @@
define(["dojo/_base/xhr",
"dojo/parser",
"dojo/query",
- "dojo/_base/connect",
+ "dojo/dom-construct",
+ "dojo/_base/array",
"qpid/common/properties",
"qpid/common/updater",
"qpid/common/util",
@@ -31,7 +32,7 @@ define(["dojo/_base/xhr",
"dojox/html/entities",
"qpid/management/addPreferencesProvider",
"dojo/domReady!"],
- function (xhr, parser, query, connect, properties, updater, util,
event, registry, domStyle, entities, addPreferencesProvider) {
+ function (xhr, parser, query, construct, array, properties, updater,
util, event, registry, domStyle, entities, addPreferencesProvider) {
function PreferencesProvider(name, parent, controller) {
this.name = name;
@@ -44,7 +45,7 @@ define(["dojo/_base/xhr",
return "PreferencesProvider:" + this.authenticationProviderName
+ "/" + this.name ;
};
- PreferencesProvider.prototype.init = function(node) {
+ PreferencesProvider.prototype.init = function(node, parentObject) {
var that = this;
xhr.get({url: "showPreferencesProvider.html",
sync: true,
@@ -52,6 +53,8 @@ define(["dojo/_base/xhr",
node.innerHTML = data;
parser.parse(node);
+ that.containerNode = node;
+ that.parentObject = parentObject;
that.preferencesProviderType=query(".preferencesProviderType", node)[0];
that.preferencesProviderName=query(".preferencesProviderName", node)[0];
that.preferencesProviderState=query(".preferencesProviderState", node)[0];
@@ -100,6 +103,16 @@ define(["dojo/_base/xhr",
that.controller.tabContainer.removeChild(that.contentPane);
that.contentPane.destroyRecursive();
}
+ else
+ {
+ var widgets =
registry.findWidgets(that.containerNode);
+ array.forEach(widgets, function(item) {
item.destroyRecursive();});
+ construct.empty(that.containerNode);
+ if (that.parentObject)
+ {
+ that.parentObject.onPreferencesProviderDeleted();
+ }
+ }
},
function(error) {that.success = false; that.failureReason
= error;});
if(!this.success ) {
@@ -129,7 +142,7 @@ define(["dojo/_base/xhr",
if (!this.details)
{
var that = this;
-
require(["qpid/management/authenticationprovider/preferences/" +
data.type.toLowerCase() + "/show"],
+ require(["qpid/management/preferencesprovider/" +
data.type.toLowerCase() + "/show"],
function(PreferencesProviderDetails) {
that.details = new
PreferencesProviderDetails(that.preferencesDetailsDiv);
that.details.update(data);
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1643103&r1=1643102&r2=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
Wed Dec 3 12:17:32 2014
@@ -82,7 +82,6 @@ define(["dojo/_base/xhr",
show:function(effectiveData)
{
this.authenticationProviderForm.reset();
- this.preferencesProviderForm.reset();
if (effectiveData)
{
@@ -106,9 +105,18 @@ define(["dojo/_base/xhr",
this.authenticationProviderName.set("value",
actualData.name);
this.authenticationProviderType.set("disabled", true);
this.authenticationProviderName.set("disabled", true);
+ if (actualData.preferencesproviders &&
actualData.preferencesproviders[0])
+ {
+
this.preferencesProviderForm.setData(actualData.preferencesproviders[0]);
+ }
+ else
+ {
+ this.preferencesProviderForm.reset();
+ }
}
else
{
+ this.preferencesProviderForm.reset();
this.authenticationProviderType.set("disabled", false);
this.authenticationProviderName.set("disabled", false);
this.initialData = {};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js?rev=1643103&r1=1643102&r2=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
Wed Dec 3 12:17:32 2014
@@ -85,8 +85,8 @@ function (util, metadata, xhr, declare,
{
if (this.preferencesProviderTypeWidget.get("value") != "None")
{
- var preferencesProviderData =
util.getFormWidgetValues(this.preferencesProviderForm); // TODO initialValues
- var encodedPreferencesProviderName =
encodeURIComponent(preferencesProviderData.name);
+ var preferencesProviderData =
util.getFormWidgetValues(this.preferencesProviderForm, this.data)
+ var encodedPreferencesProviderName =
encodeURIComponent(this.preferencesProviderNameWidget.get("value"));
var success = false;
var failureReason = null;
xhr.put({
@@ -114,8 +114,13 @@ function (util, metadata, xhr, declare,
handleAs: "json"
}).then(function(data){that._load(data[0])});
},
+ setData: function(data)
+ {
+ this._load(data);
+ },
_load:function(data)
{
+ data = data || {}
this.data = data;
this.preferencesProviderNameWidget.set("value", data.name);
if (data.type == this.preferencesProviderTypeWidget.get("value"))
@@ -184,7 +189,10 @@ function (util, metadata, xhr, declare,
{
this.inherited(arguments);
this.disabled = disabled;
- this.reset();
+ if (disabled)
+ {
+ this.reset();
+ }
},
});
});
Copied:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
(from r1643087,
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js?p2=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js&p1=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js&r1=1643087&r2=1643103&rev=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/preferences/filesystempreferences/show.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
Wed Dec 3 12:17:32 2014
@@ -28,7 +28,7 @@ define(["dojo/_base/xhr",
function FileSystemPreferences(containerNode) {
var that = this;
- xhr.get({url:
"authenticationprovider/preferences/filesystempreferences/show.html",
+ xhr.get({url: "preferencesprovider/filesystempreferences/show.html",
sync: true,
load: function(template) {
containerNode.innerHTML = template;
Copied:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/filesystempreferences/show.html
(from r1643087,
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/filesystempreferences/show.html?p2=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/filesystempreferences/show.html&p1=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html&r1=1643087&r2=1643103&rev=1643103&view=diff
==============================================================================
(empty)
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html?rev=1643103&r1=1643102&r2=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
Wed Dec 3 12:17:32 2014
@@ -37,12 +37,10 @@
<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="deleteAuthenticationProviderButton" type="button">Delete</button>
+ <button data-dojo-type="dijit.form.Button"
class="addPreferencesProviderButton">Add Preferences Provider</button>
</div>
</div>
<br/>
- <div class="clear preferencesPanel" data-dojo-type="dijit.TitlePane"
data-dojo-props="title: 'Preferences Provider', open: true">
- <div class="preferencesProviderDetails"></div>
- <button data-dojo-type="dijit.form.Button"
class="addPreferencesProviderButton">Add</button>
- </div>
+ <div class="preferencesProviderDetails"></div>
<br/>
</div>
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html?rev=1643103&r1=1643102&r2=1643103&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
Wed Dec 3 12:17:32 2014
@@ -18,7 +18,7 @@
- under the License.
-
-->
- <div class="preferencesProvider">
+<div class="preferencesProvider">
<div class="preferencesProviderAttributes" data-dojo-type="dijit.TitlePane"
data-dojo-props="title: 'Preferences Provider Attributes', open: true">
<div class="clear">
<div class="formLabel-labelCell">Type:</div>
@@ -33,10 +33,10 @@
<div class="preferencesProviderState"></div>
</div>
<div class="preferencesDetails"></div>
- </div>
- <div class="clear"></div>
- <div class="clear dijitDialogPaneActionBar">
- <button data-dojo-type="dijit.form.Button"
class="editPreferencesProviderButton">Edit</button>
- <button data-dojo-type="dijit.form.Button"
class="deletePreferencesProviderButton">Delete</button>
+ <div class="clear"></div>
+ <div class="clear dijitDialogPaneActionBar">
+ <button data-dojo-type="dijit.form.Button"
class="editPreferencesProviderButton">Edit</button>
+ <button data-dojo-type="dijit.form.Button"
class="deletePreferencesProviderButton">Delete</button>
+ </div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
