Hi,

Changes after R 14265  seems to have broken the way devices are displayed

see below example on 14265

 

Update to 14266 breaks this display see example below , only 3 files where updated



svn update -r 14266

Updating '.':

A    html/ajax/panel.php

U    html/index.php

U    html/pages/device.inc.php

Updated to revision 14266.

 


 

 

svn diff -r 14265:14266 html/pages/device.inc.php

Index: html/pages/device.inc.php

===================================================================

--- html/pages/device.inc.php   (revision 14265)

+++ html/pages/device.inc.php   (revision 14266)

@@ -101,13 +101,13 @@

// Show tabs if the user has access to this device

 

if (!device_permitted($device['device_id'])) {

-    register_html_panel('default'); // default xl panel

+    //register_html_panel('default'); // default xl panel

 

     // Print the device header (do not hide in xl for entity permitted)

     print_device_header($device);

} else {

     // Device permitted, show full info

-    //register_html_panel(generate_device_panel($device));

+    register_html_panel(generate_device_panel($device));

 

     // Print the device header

     print_device_header($device, [ 'div-class' => 'hidden-xl' ]);

 

 

svn diff -r 14265:14266 html/ajax/panel.php

svn: E155010: The node '/opt/observium/html/ajax/panel.php' was not found.

 

svn diff -r 14265:14266 html/index.php

Index: html/index.php

===================================================================

--- html/index.php      (revision 14265)

+++ html/index.php      (revision 14266)

@@ -238,39 +238,30 @@

         $panel_name = $vars['page'];

     }

     //r($panel_name);

-    if ($config['pages'][$panel_name]['custom_panel']) {

-        include($page_file);

+

+    echo '<div class="row">';

+

+    if ($config['pages'][$panel_name]['no_panel']) {

+        // Skip any panel loading

+        echo '      <div class="col-lg-12">';

     } else {

-        echo '<div class="row">';

-

-        if ($config['pages'][$panel_name]['no_panel']) {

-            echo '<div class="col-lg-12">';

-        } else {

-            echo '

+        // Left panel placeholder

+        // Attrib data-panel="default" for ajax panel loading

+        echo '

       <div class="col-xl-4 visible-xl">

-        <div id="myAffix" data-spy="affix" data-offset-top="60">

+        <div id="myAffix" data-spy="affix" data-offset-top="60" data-panel="default">

         ##PAGE_PANEL##

         </div>

       </div>

-    <div class="col-xl-8 col-lg-12">';

-        }

-

-        include($page_file);

-        echo '</div>';

+      <div class="col-xl-8 col-lg-12">';

     }

 

-    // Register default panel if custom not set

-    if (!isset($GLOBALS['cache_html']['page_panel'])) {

-        if (is_file($config['html_dir'] . "/includes/panels/" . $panel_name . ".inc.php")) {

-            $panel_file = $config['html_dir'] . "/includes/panels/" . $panel_name . ".inc.php";

-        } else {

-            $panel_file = $config['html_dir'] . "/includes/panels/default.inc.php"; // default

-        }

-        ob_start();

-        include($panel_file);

-        $panel_html = ob_get_clean();

+    include($page_file);

+    echo '      </div>';

 

-        register_html_panel($panel_html);

+    // Register default panel (when not registered on pages)

+    if (!$config['pages'][$panel_name]['no_panel'] && !isset($GLOBALS['cache_html']['page_panel'])) {

+        register_html_panel('default');

     }

}

 

 

 

 


Pieter Meyer
Technical Director

Converged Group | Licensed ISP 0258/IECNS/JAN/09
Ground Floor, Block 7, Fancourt Office Park, cnr Northumberland and Felstead Road, Northriding, JHB
Office: +27 10 591 4600 | Direct Line: +27 10 591 4600 | Mobile: +27 83 233 6614

Connect, like, follow or chat on social media:


Shutdown 2024

Please take note that we will never change or amend our banking details via email or other electronic forums. Please contact our office for formal verification should you receive any correspondence of such nature.

CAUTION: This email and any attachments may contain information that is confidential and subject to legal privilege. If you are not the intended recipient, you must not read, use, disseminate, distribute or copy this email or any attachments. If you have received this email in error, please notify us immediately and erase this email and any attachments. Thank you.

DISCLAIMER:The information contained in this communication from the sender is confidential. It is intended solely for use by the recipient and others authorized to receive it. If you are not the recipient, you are hereby notified that any disclosure, copying, distribution or taking action in relation of the contents of this information is strictly prohibited and may be unlawful. This email has been scanned for viruses and malware, and may have been automatically archived by Mimecast, a leader in email security and cyber resilience. Mimecast integrates email defenses with brand protection, security awareness training, web security, compliance and other essential capabilities. Mimecast helps protect large and small organizations from malicious activity, human error and technology failure; and to lead the movement toward building a more resilient world. To find out more, visit our website.