ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Correct Device Reset page reload

Browse source 
Stay on page with page reset
Correct output
Switch from modal to Toast
This commit is contained in:
steve-lad 2021-06-14 16:00:03 +02:00
parent 707371cb92
commit 5ea2c83115
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assets/js/sccp_manager.js
View file

@ -580,10 +580,10 @@ $(document).ready(function () {
var i = 0; var i = 0;
var conf_msg = '??????'; var conf_msg = '??????';
if ($(this).data('id') === 'reset_dev') { if ($(this).data('id') === 'reset_dev') {
conf_msg = 'Reset All device ?'; conf_msg = 'Reset ALL devices ?';
} }
if ($(this).data('id') === 'reset_token') { 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') { if ($(this).data('id') === 'update_button_label') {
conf_msg = 'Update Button Labels on ALL devices ?'; conf_msg = 'Update Button Labels on ALL devices ?';
@ -628,11 +628,11 @@ $(document).ready(function () {
} else { } else {
if (Array.isArray(data.message)) { if (Array.isArray(data.message)) {
data.message.forEach(function (entry) { data.message.forEach(function (entry) {
bs_alert(entry,data.status); fpbxToast(data.message[1],_('Error Result'), 'warning');
}); });
} else { } else {
if (data.message) { if (data.message) {
bs_alert(data.message,data.status); fpbxToast(data.message,_('Error Result'), 'warning');
} else { } else {
if (data) { if (data) {
bs_alert(data,data.status); bs_alert(data,data.status);

7
sccpManTraits/ajaxHelper.php
View file

@ -140,7 +140,7 @@ trait ajaxHelper {
case 'reset_dev': case 'reset_dev':
$msg = ''; $msg = '';
$msgr = array(); $msgr = array();
$msgr[] = 'Reset command send'; $msgr[] = "Reset command sent to device(s) ";
if (!empty($request['name'])) { if (!empty($request['name'])) {
foreach ($request['name'] as $idv) { foreach ($request['name'] as $idv) {
$msg = strpos($idv, 'SEP-'); $msg = strpos($idv, 'SEP-');
@ -153,13 +153,14 @@ trait ajaxHelper {
$msgr[] = $msg . ' ' . $res['Response'] . ' ' . $res['data']; $msgr[] = $msg . ' ' . $res['Response'] . ' ' . $res['data'];
} }
} }
if ($idv == 'all') { if ($idv == 'all') {
$dev_list = $this->aminterface->sccp_get_active_device(); $dev_list = $this->aminterface->sccp_get_active_device();
foreach ($dev_list as $key => $data) { foreach ($dev_list as $key => $data) {
if ($cmd_id == 'reset_token') { if ($cmd_id == 'reset_token') {
if (($data['token'] == 'Rej') || ($data['status'] == 'Token ')) { if (($data['token'] == 'Rej') || ($data['status'] == 'Token ')) {
$res = $this->aminterface->sccpDeviceReset($idv, 'tokenack'); $res = $this->aminterface->sccpDeviceReset($idv, 'tokenack');
$msgr[] = 'Send Token reset to :' . $key; $msgr[] = 'Sent Token reset to :' . $key;
} }
} else { } else {
$res = $this->aminterface->sccpDeviceReset($idv, 'reset'); $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; break;
case 'update_button_label': case 'update_button_label':
$msg = ''; $msg = '';