You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/09/06 13:11:42 UTC

svn commit: r1759431 - /qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js

Author: orudyy
Date: Tue Sep  6 13:11:42 2016
New Revision: 1759431

URL: http://svn.apache.org/viewvc?rev=1759431&view=rev
Log:
QPID-7380: [Java Broker, WMC] Cache header inclusion flag on message viewing

Modified:
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js?rev=1759431&r1=1759430&r2=1759431&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js Tue Sep  6 13:11:42 2016
@@ -56,7 +56,7 @@ define(["dojo/dom",
         }
 
         var populatedFields = [];
-        var showMessage = {};
+        var showMessage = {includeHeaders: true};
 
         showMessage.hide = function ()
         {
@@ -203,7 +203,7 @@ define(["dojo/dom",
             }
         };
 
-        showMessage.show = function (management, modelObj, message)
+        var loadMessage = function (management, modelObj, id, includeHeaders, errorHandler)
         {
             var obj = {
                 name: "getMessageInfoById",
@@ -212,26 +212,25 @@ define(["dojo/dom",
             };
             management.load(obj,
                 {
-                    messageId: message.id,
-                    includeHeaders: true
+                    messageId: id,
+                    includeHeaders: includeHeaders
                 })
                 .then(function (data)
-                {
-                    showMessage.populateShowMessage(management, modelObj, data, true);
-                },
-                function(e)
+                    {
+                        showMessage.populateShowMessage(management, modelObj, data, includeHeaders);
+                    },
+                    errorHandler);
+        };
+
+        showMessage.show = function (management, modelObj, message)
+        {
+            loadMessage(management, modelObj, message.id, this.includeHeaders,
+                function (e)
                 {
                     if (e.response && e.response.status == 403)
                     {
-                        management.load(obj,
-                                        {
-                                            messageId: message.id,
-                                            includeHeaders: false
-                                        })
-                            .then(function(data)
-                            {
-                                showMessage.populateShowMessage(management, modelObj, data, false);
-                            });
+                        showMessage.includeHeaders = false;
+                        loadMessage(management, modelObj, message.id, false);
                     }
                     else
                     {



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