summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJannik Schönartz2022-01-17 15:53:44 +0100
committerJannik Schönartz2022-01-17 15:53:44 +0100
commit84ab258726ffa1c9f49c60259c8209bdfdd88c10 (patch)
treee4073da17fa1787be2f8c181d2771ce9b7cd73f7
parent[server] Remove unused legacy code (diff)
downloadbas-84ab258726ffa1c9f49c60259c8209bdfdd88c10.tar.gz
bas-84ab258726ffa1c9f49c60259c8209bdfdd88c10.tar.xz
bas-84ab258726ffa1c9f49c60259c8209bdfdd88c10.zip
[server/registration] Accepting bas ids as location for clients instead of only names
-rw-r--r--server/api/registration.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/server/api/registration.js b/server/api/registration.js
index 41d5fac..7641f87 100644
--- a/server/api/registration.js
+++ b/server/api/registration.js
@@ -512,7 +512,7 @@ function getRecursiveParents (groupIds) {
*/
async function parseHardwareInformation (data) {
let client = {
- 'parents': [], // TODO:
+ 'parents': [],
'type': data.type ? data.type : 'CLIENT', // SERVER OR CLIENT
'uuid': '',
'networks': [], // { 'mac': '', 'ip': '' }
@@ -752,6 +752,9 @@ async function parseHardwareInformation (data) {
const parent = await db.group.findOne({ where: { name: data.location.parent } })
// findOne only returns the first object with the matching name, so if the name isn't unique id should be used
client.parents.push(parent.id)
+ } else if (data.location.parent) {
+ const pid = Number(data.location.parent)
+ if (!isNaN(pid)) client.parents.push(pid)
}
// Add bay and slot if given