You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/03/15 14:19:56 UTC
svn commit: r1787052 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management:
accesscontrolprovider/AclFile.js store/managedcertificatestore/show.js
Author: kwall
Date: Wed Mar 15 14:19:56 2017
New Revision: 1787052
URL: http://svn.apache.org/viewvc?rev=1787052&view=rev
Log:
QPID-7707: [Web Management Console] Ensure that failure of the ACL reload or ManagedCertificate deletion is directed to the XHR error handler
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1787052&r1=1787051&r2=1787052&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Wed Mar 15 14:19:56 2017
@@ -19,6 +19,7 @@
*
*/
define(["dojo/_base/xhr",
+ "dojo/_base/lang",
"dojo/dom",
"dojo/parser",
"dojo/query",
@@ -48,6 +49,7 @@ define(["dojo/_base/xhr",
"dijit/form/DateTextBox",
"dojo/domReady!"],
function (xhr,
+ lang,
dom,
parser,
query,
@@ -143,6 +145,7 @@ define(["dojo/_base/xhr",
AclFileUpdater.prototype.reload = function ()
{
+ this.reloadButton.set("disabled", true);
var parentModelObj = this.modelObj;
var modelObj = {
type: parentModelObj.type,
@@ -150,7 +153,12 @@ define(["dojo/_base/xhr",
parent: parentModelObj
};
var url = this.management.buildObjectURL(modelObj);
- this.management.post({url: url}, {});
+ this.management.post({url: url}, {})
+ .then(null, management.xhrErrorHandler)
+ .always(lang.hitch(this, function ()
+ {
+ this.reloadButton.set("disabled", false);
+ }));
};
return AclFile;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js?rev=1787052&r1=1787051&r2=1787052&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js Wed Mar 15 14:19:56 2017
@@ -198,6 +198,7 @@ define(["dojo/query",
if (data.length)
{
+ this.removeButton.set("disabled", true);
var parentModelObj = this.modelObj;
var modelObj = {
type: parentModelObj.type,
@@ -214,7 +215,12 @@ define(["dojo/query",
});
}
var url = this.management.buildObjectURL(modelObj);
- this.management.post({url: url}, {certificates: items});
+ this.management.post({url: url}, {certificates: items})
+ .then(null, management.xhrErrorHandler)
+ .always(lang.hitch(this, function ()
+ {
+ this.removeButton.set("disabled", false);
+ }));
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org