From 1a02539f232bc6e3611756391e9c1d9f07d16217 Mon Sep 17 00:00:00 2001 From: nmmclwhitehead <46906609+nmmclwhitehead@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:27:50 -0500 Subject: [PATCH] Added support for &gotodeviceip=x.x.x.x (#6672) --- views/default-mobile.handlebars | 5 +++++ views/default.handlebars | 7 ++++++- views/default3.handlebars | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index 33746bca..2e916a22 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -1304,6 +1304,7 @@ delete urlargs.viewmode; delete urlargs.gotonode; delete urlargs.gotodevicename; + delete urlargs.gotodeviceip; delete urlargs.gotomesh; delete urlargs.panel; @@ -2229,6 +2230,10 @@ var foundNode = null; if (nodes != null) { for (var i in nodes) { if (nodes[i].name == args.gotodevicename) { foundNode = nodes[i]._id; } } } if (foundNode) { gotoDevice(foundNode, xviewmode); go(xviewmode); } + } else if (args.gotodeviceip != null) { + var foundNode = null; + if (nodes != null) { for (var i in nodes) { if (nodes[i].ip == args.gotodeviceip) { foundNode = nodes[i]._id; } } } + if (foundNode) { gotoDevice(foundNode, xviewmode); go(xviewmode); } } else if (args.gotomesh != null) { if (meshes['mesh/' + domain + '/' + args.gotomesh] == null) return; // This device group is not loaded yet gotoMesh('mesh/' + domain + '/' + args.gotomesh); diff --git a/views/default.handlebars b/views/default.handlebars index b4b8c4bb..3e5b5842 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -1642,6 +1642,7 @@ delete urlargs.viewmode; delete urlargs.gotonode; delete urlargs.gotodevicename; + delete urlargs.gotodeviceip; delete urlargs.gotomesh; delete urlargs.gotouser; delete urlargs.gotougrp; @@ -4018,6 +4019,10 @@ var foundNode = null; if (nodes != null) { for (var i in nodes) { if (nodes[i].name == args.gotodevicename) { foundNode = nodes[i]._id; } } } if (foundNode) { gotoDevice(foundNode, xviewmode); goBackStack.push(1); } + } else if (args.gotodeviceip != null) { + var foundNode = null; + if (nodes != null) { for (var i in nodes) { if (nodes[i].ip == args.gotodeviceip) { foundNode = nodes[i]._id; } } } + if (foundNode) { gotoDevice(foundNode, xviewmode); goBackStack.push(1); } } else if (args.gotomesh != null) { if (meshes['mesh/' + domain + '/' + args.gotomesh] == null) return; // This device group is not loaded yet gotoMesh('mesh/' + domain + '/' + args.gotomesh); @@ -19271,4 +19276,4 @@ - \ No newline at end of file + diff --git a/views/default3.handlebars b/views/default3.handlebars index c321fdc5..26c28029 100644 --- a/views/default3.handlebars +++ b/views/default3.handlebars @@ -2065,6 +2065,7 @@ delete urlargs.viewmode; delete urlargs.gotonode; delete urlargs.gotodevicename; + delete urlargs.gotodeviceip; delete urlargs.gotomesh; delete urlargs.gotouser; delete urlargs.gotougrp; @@ -4474,6 +4475,10 @@ var foundNode = null; if (nodes != null) { for (var i in nodes) { if (nodes[i].name == args.gotodevicename) { foundNode = nodes[i]._id; } } } if (foundNode) { gotoDevice(foundNode, xviewmode); goBackStack.push(1); } + } else if (args.gotodeviceip != null) { + var foundNode = null; + if (nodes != null) { for (var i in nodes) { if (nodes[i].ip == args.gotodeviceip) { foundNode = nodes[i]._id; } } } + if (foundNode) { gotoDevice(foundNode, xviewmode); goBackStack.push(1); } } else if (args.gotomesh != null) { if (meshes['mesh/' + domain + '/' + args.gotomesh] == null) return; // This device group is not loaded yet gotoMesh('mesh/' + domain + '/' + args.gotomesh); @@ -20572,4 +20577,4 @@ - \ No newline at end of file +