From fb7940b2cecfdef474362e58d187de75458102cd Mon Sep 17 00:00:00 2001 From: si458 Date: Thu, 19 Jun 2025 17:17:06 +0100 Subject: [PATCH] revert getDeviceDetails commits as was external problem Signed-off-by: si458 --- meshctrl.js | 6 +----- meshuser.js | 2 +- views/default.handlebars | 2 +- views/default3.handlebars | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/meshctrl.js b/meshctrl.js index b2a8e804..e2d2e168 100644 --- a/meshctrl.js +++ b/meshctrl.js @@ -2592,11 +2592,7 @@ function serverConnect() { break; } case 'getDeviceDetails': { - if (args.json) { - console.log(JSON.stringify(data.data)); - } else { - console.log(data.data); - } + console.log(data.data); process.exit(); } case 'report': { diff --git a/meshuser.js b/meshuser.js index 8a810784..64e33a69 100644 --- a/meshuser.js +++ b/meshuser.js @@ -5365,7 +5365,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use } } - output = results; + output = JSON.stringify(results); } try { ws.send(JSON.stringify({ action: 'getDeviceDetails', data: output, type: type })); } catch (ex) { } }); diff --git a/views/default.handlebars b/views/default.handlebars index 92469a1a..faf55a63 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -4017,7 +4017,7 @@ break; } case 'getDeviceDetails': { - saveAs(new Blob([typeof message.data === 'string' ? message.data : JSON.stringify(message.data)], {type: 'application/octet-stream'}), "devicelist" + '.' + message.type); + saveAs(new Blob([message.data], { type: 'application/octet-stream' }), "devicelist" + '.' + message.type); break; } case 'createLoginToken': { // A new login token was created diff --git a/views/default3.handlebars b/views/default3.handlebars index eb1aa639..12b6022f 100644 --- a/views/default3.handlebars +++ b/views/default3.handlebars @@ -4483,7 +4483,7 @@ break; } case 'getDeviceDetails': { - saveAs(new Blob([typeof message.data === 'string' ? message.data : JSON.stringify(message.data)], {type: 'application/octet-stream'}), "devicelist" + '.' + message.type); + saveAs(new Blob([message.data], { type: 'application/octet-stream' }), "devicelist" + '.' + message.type); break; } case 'createLoginToken': { // A new login token was created