Fix member variable for datamodel in Display

(cherry picked from commit da43ccf)
(cherry picked from commit 3018405)

# Conflicts:
#	deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs

Author: MarcialRosales

deps/rabbitmq_management/priv/www/js/global.js

@@ -691,7 +691,7 @@ function DisplayControl() {
   this.vhosts = false
   this.rabbitmqVersions = false
 
-  this.update = function(overview, ui_data_model) {
+  this.update = function(overview, ui_data_model) {    
     this.nodes = ac.canListNodes() && ui_data_model.nodes.length > 1
     this.vhosts = ac.canAccessVhosts()
     this.rabbitmqVersions = false

deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs

@@ -284,8 +284,13 @@
         </tr>
 <% } %>
 <%
+<<<<<<< HEAD
   if (nodes_interesting) {
    var nodes = JSON.parse(sync_get('/nodes'));
+=======
+  if (ac.canListNodes()) {
+   var nodes = display.data.nodes
+>>>>>>> 30184053c9 (Fix member variable for datamodel in Display)
 %>
         <tr>
           <th><label>Node:</label></th>