From 03057edd6c98ed4f9d718dde4f90cd7334a8fdd0 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:39:23 +0200
Subject: [PATCH] Fix Broken Rnav in add device

Replace _DIR_ with absolute path; _DIR_ references sccpTraits
Fix error in toolbar id
---
 sccpManTraits/bmoFunctions.php |  3 +--
 views/hardware.rnav.php        | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/sccpManTraits/bmoFunctions.php b/sccpManTraits/bmoFunctions.php
index 5ff2e18..9d54576 100644
--- a/sccpManTraits/bmoFunctions.php
+++ b/sccpManTraits/bmoFunctions.php
@@ -34,7 +34,6 @@ trait bmoFunctions {
     }
 
     public function getActionBar($request) {
-      dbug('request',$request);
         $buttons = array();
         switch ($request['display']) {
             case 'sccp_adv':
@@ -110,7 +109,7 @@ trait bmoFunctions {
 
     public function getRightNav($request) {
         if (isset($request['tech_hardware']) && ($request['tech_hardware'] == 'cisco')) {
-            return load_view(__DIR__ . "/views/hardware.rnav.php", array('request' => $request));
+            return load_view("/var/www/html/admin/modules/sccp_manager/views/hardware.rnav.php", array('request' => $request));
         }
     }
 
diff --git a/views/hardware.rnav.php b/views/hardware.rnav.php
index df0271e..3080456 100644
--- a/views/hardware.rnav.php
+++ b/views/hardware.rnav.php
@@ -1,18 +1,24 @@
-<div id="toolbar-sccpbnav">
-<a href="config.php?display=sccp_phone#sccpdevice" class = "btn btn-default"><i class="fa fa-list"></i>&nbsp;<?php echo _("List Device")?></a>
-<a href="config.php?display=sccp_phone&amp;tech_hardware=cisco" class = "btn btn-default"><i class="fa fa-plus"></i>&nbsp;<?php echo _("Add Device")?></a>
+<div id="toolbar-sccp-rnav">
+    <a class="btn btn-default" href="config.php?display=sccp_phone#sccpdevice">
+        <i class="fa fa-list"></i>&nbsp;
+        <?php echo _("List Device")?>
+    </a>
+    <a class="btn btn-default" href="config.php?display=sccp_phone&amp;tech_hardware=cisco">
+        <i class="fa fa-plus">&nbsp;</i>
+        <?php echo _("Add Device")?>
+    </a>
 </div>
 <table id="sccpnavgrid"
-        data-search="true"
-        data-toolbar="#toolbar-sccpnav"
-        data-url="ajax.php?module=sccp_manager&amp;command=getPhoneGrid&amp;type=sccp"
-        data-cache="false"
-        data-toggle="table" 
-        class="table">
+    data-search="true"
+    data-toolbar="#toolbar-sccp-rnav"
+    data-url="ajax.php?module=sccp_manager&command=getPhoneGrid&type=sccp"
+    data-cache="false"
+    data-toggle="table"
+    class="table">
     <thead>
-            <tr>
-                            <th data-sortable="true" data-field="mac"><?php echo _('SEP ID') ?></th>
-                            <th data-sortable="true" data-field="description"><?php echo _('Descriptions') ?></th>
+        <tr>
+              <th data-sortable="true" data-field="mac"><?php echo _('SEP ID')?></th>
+              <th data-sortable="true" data-field="description"><?php echo _('Descriptions')?></th>
         </tr>
     </thead>
 </table>