qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1767919 - in /qpid/java/branches/6.1.x: ./ broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
Date Thu, 03 Nov 2016 16:07:30 GMT
Author: orudyy
Date: Thu Nov  3 16:07:30 2016
New Revision: 1767919

URL: http://svn.apache.org/viewvc?rev=1767919&view=rev
Log:
QPID-7483: Fix name in confirmation message for trustore deletion

merged from trunk using
svn merge -c 1767914 ^/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/TrustStore.js

Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  3 16:07:30 2016
@@ -9,5 +9,5 @@
 /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,1767882
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767882,1767914
 /qpid/trunk/qpid:796646-796653

Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1767919&r1=1767918&r2=1767919&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
(original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
Thu Nov  3 16:07:30 2016
@@ -178,7 +178,7 @@ define(["dojo/dom",
 
         TrustStore.prototype.deleteKeyStore = function ()
         {
-            if (confirm("Are you sure you want to delete trust store '" + this.keyStoreName
+ "'?"))
+            if (confirm("Are you sure you want to delete trust store '" + this.name + "'?"))
             {
                 var that = this;
                 this.management.remove(this.modelObj)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message