From 5ea2c831152740b2690c01d8eae9cbe1c63d215b Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Mon, 14 Jun 2021 16:00:03 +0200
Subject: [PATCH] Correct Device Reset page reload

Stay on page with page reset
Correct output
Switch from modal to Toast
---
 assets/js/sccp_manager.js    | 8 ++++----
 sccpManTraits/ajaxHelper.php | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js
index da86215..1189908 100644
--- a/assets/js/sccp_manager.js
+++ b/assets/js/sccp_manager.js
@@ -580,10 +580,10 @@ $(document).ready(function () {
             var i = 0;
             var conf_msg = '??????';
             if ($(this).data('id') === 'reset_dev') {
-                conf_msg = 'Reset All device ?';
+                conf_msg = 'Reset ALL devices ?';
             }
             if ($(this).data('id') === 'reset_token') {
-                conf_msg = 'Reset Token on All device ?';
+                conf_msg = 'Reset Token on ALL devices ?';
             }
             if ($(this).data('id') === 'update_button_label') {
                 conf_msg = 'Update Button Labels on ALL devices ?';
@@ -628,11 +628,11 @@ $(document).ready(function () {
                     } else {
                         if (Array.isArray(data.message)) {
                             data.message.forEach(function (entry) {
-                                bs_alert(entry,data.status);
+                                fpbxToast(data.message[1],_('Error Result'), 'warning');
                             });
                         } else {
                             if (data.message) {
-                                bs_alert(data.message,data.status);
+                                fpbxToast(data.message,_('Error Result'), 'warning');
                             } else {
                                 if (data) {
                                     bs_alert(data,data.status);
diff --git a/sccpManTraits/ajaxHelper.php b/sccpManTraits/ajaxHelper.php
index 7d21724..e8485b1 100644
--- a/sccpManTraits/ajaxHelper.php
+++ b/sccpManTraits/ajaxHelper.php
@@ -140,7 +140,7 @@ trait ajaxHelper {
             case 'reset_dev':
                 $msg = '';
                 $msgr = array();
-                $msgr[] = 'Reset command send';
+                $msgr[] = "Reset command sent to device(s) ";
                 if (!empty($request['name'])) {
                     foreach ($request['name'] as $idv) {
                         $msg = strpos($idv, 'SEP-');
@@ -153,13 +153,14 @@ trait ajaxHelper {
                                 $msgr[] = $msg . ' ' . $res['Response'] . ' ' . $res['data'];
                             }
                         }
+
                         if ($idv == 'all') {
                             $dev_list = $this->aminterface->sccp_get_active_device();
                             foreach ($dev_list as $key => $data) {
                                 if ($cmd_id == 'reset_token') {
                                     if (($data['token'] == 'Rej') || ($data['status'] == 'Token ')) {
                                         $res = $this->aminterface->sccpDeviceReset($idv, 'tokenack');
-                                        $msgr[] = 'Send Token reset to :' . $key;
+                                        $msgr[] = 'Sent Token reset to :' . $key;
                                     }
                                 } else {
                                     $res = $this->aminterface->sccpDeviceReset($idv, 'reset');
@@ -169,7 +170,7 @@ trait ajaxHelper {
                         }
                     }
                 }
-                return array('status' => true, 'message' => $msgr, 'reload' => true);
+                return array('status' => (($res['Response'] == 'Error')? false : true ), 'message' => $msgr, 'reload' => false, 'table_reload' => true);
                 break;
             case 'update_button_label':
                 $msg = '';