Hide disc/RAM node type if mnevis is present

Author: lukebakken

priv/www/js/tmpl/node.ejs

@@ -25,17 +25,19 @@
     <tr>
       <th>Info</th>
       <td>
-         <abbr title="Message rates"><%= fmt_string(node.rates_mode) %></abbr>
-       <% if (node.type == 'disc') { %>
-         <abbr title="Broker definitions are held on disc.">disc</abbr>
-       <% } else { %>
-         <abbr title="Broker definitions are held in RAM. Messages will still be written to disc if necessary.">RAM</abbr>
-       <% } %>
-       <%= fmt_plugins_small(node) %>
-         <abbr title="Memory calculation strategy"><%= fmt_string(node.mem_calculation_strategy) %></abbr>
-       <% if (node.is_mnevis_leader) { %>
-         <abbr title="Node is mnevis leader">leader</abbr>
-       <% } %>
+        <abbr title="Message rates"><%= fmt_string(node.rates_mode) %></abbr>
+        <% if (!node.hasOwnProperty('is_mnevis_leader')) { %>
+          <% if (node.type == 'disc') { %>
+            <abbr title="Broker definitions are held on disc.">disc</abbr>
+          <% } else { %>
+            <abbr title="Broker definitions are held in RAM. Messages will still be written to disc if necessary.">RAM</abbr>
+          <% } %>
+        <% } %>
+        <%= fmt_plugins_small(node) %>
+        <abbr title="Memory calculation strategy"><%= fmt_string(node.mem_calculation_strategy) %></abbr>
+        <% if (node.hasOwnProperty('is_mnevis_leader') && node.is_mnevis_leader) { %>
+          <abbr title="Node is mnevis leader">leader</abbr>
+        <% } %>
       </td>
     </tr>
     <tr>

priv/www/js/tmpl/overview.ejs

@@ -175,14 +175,19 @@
   <% } %>
   <% if (show_column('overview', 'info')) { %>
      <td>
-         <abbr title="Message rates"><%= fmt_string(node.rates_mode) %></abbr>
-       <% if (node.type === 'disc') { %>
-         <abbr title="Broker definitions are held on disc.">disc</abbr>
-       <% } else { %>
-         <abbr title="Broker definitions are held in RAM. Messages will still be written to disc if necessary.">RAM</abbr>
+       <abbr title="Message rates"><%= fmt_string(node.rates_mode) %></abbr>
+       <% if (!node.hasOwnProperty('is_mnevis_leader')) { %>
+         <% if (node.type === 'disc') { %>
+           <abbr title="Broker definitions are held on disc.">disc</abbr>
+         <% } else { %>
+           <abbr title="Broker definitions are held in RAM. Messages will still be written to disc if necessary.">RAM</abbr>
+         <% } %>
        <% } %>
        <%= fmt_plugins_small(node) %>
-         <abbr title="Memory calculation strategy"><%= fmt_string(node.mem_calculation_strategy) %></abbr>
+       <abbr title="Memory calculation strategy"><%= fmt_string(node.mem_calculation_strategy) %></abbr>
+       <% if (node.hasOwnProperty('is_mnevis_leader') && node.is_mnevis_leader) { %>
+         <abbr title="Node is mnevis leader">leader</abbr>
+       <% } %>
      </td>
   <% } %>
   <% if(user_administrator && show_column('overview', 'reset_stats')) { %>