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:49:36 UTC
svn commit: r1787057 - in /qpid/java/branches/6.1.x: ./
broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/
broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificates...
Author: kwall
Date: Wed Mar 15 14:49:36 2017
New Revision: 1787057
URL: http://svn.apache.org/viewvc?rev=1787057&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
Merged from trunk with command:
svn merge -c 1787052 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 15 14:49:36 2017
@@ -9,6 +9,6 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1785988,1786188-1786189,1786342,1786657,1786690,1786723,1786914,1786923
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1785988,1786188-1786189,1786342,1786657,1786690,1786723,1786914,1786923,1787052
/qpid/qpid-jms-amqp-0-x/trunk:1785989
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1787057&r1=1787056&r2=1787057&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Wed Mar 15 14:49:36 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/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js?rev=1787057&r1=1787056&r2=1787057&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js Wed Mar 15 14:49:36 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