QPID-6398: [Java Broker] Update web management console UI to invoke dojo parser.parse as a promise due to changes in dojo 1.8 causing the parser to run in asynchronous fashion in some cases

svn merge -c 1661166  https://svn.apache.org/repos/asf/qpid/trunk



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661935 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 4 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
index 89b0b5d88f..7d78026d05 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
@@ -36,10 +36,12 @@ define(["dojo/query",
         {
             this.fields.push(name);
         }
-        util.buildUI(data.containerNode, data.parent, "store/nonjavatruststore/show.html", this.fields, this);
-        var gridNode = query(".details", data.containerNode)[0];
-        var dateTimeFormatter = function(value){ return value ? UserPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";};
-        this.detailsGrid = new UpdatableStore([],
+        var that = this;
+        util.buildUI(data.containerNode, data.parent, "store/nonjavatruststore/show.html", this.fields, this, function()
+        {
+            var gridNode = query(".details", data.containerNode)[0];
+            var dateTimeFormatter = function(value){ return value ? UserPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";};
+            that.detailsGrid = new UpdatableStore([],
                   gridNode,
                   [
                    { name: 'Subject', field: 'SUBJECT_NAME', width: '25%' },
@@ -47,6 +49,7 @@ define(["dojo/query",
                    { name: 'Valid from', field: 'VALID_START', width: '25%', formatter: dateTimeFormatter },
                    { name: 'Valid to', field: 'VALID_END', width: '25%', formatter: dateTimeFormatter}
                   ]);
+        });
     }
 
     NonJavaTrustStore.prototype.update = function(data)