summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/api/ipranges.js7
-rw-r--r--server/api/wakerequests.js2
-rw-r--r--server/lib/grouputil.js2
-rw-r--r--webapp/src/components/GroupModuleGroupView.vue2
4 files changed, 6 insertions, 7 deletions
diff --git a/server/api/ipranges.js b/server/api/ipranges.js
index 16ea3e5..2a40763 100644
--- a/server/api/ipranges.js
+++ b/server/api/ipranges.js
@@ -1,7 +1,6 @@
/* global __appdir */
var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
-var wol = require('node-wol')
var express = require('express')
const { decorateApp } = require('@awaitjs/express')
var router = decorateApp(express.Router())
@@ -12,7 +11,7 @@ const iphelper = require(path.join(__appdir, 'lib', 'iphelper'))
// ########################### GET requests #################################
router.getAsync('', async (req, res) => {
- const ipranges = await db.iprange.findAll({ include: ['group'] })
+ const ipranges = await db.iprange.findAll({ order: [['group', 'name', 'ASC']], include: ['group'] })
ipranges.forEach(iprange => {
iprange.startIp = iphelper.toIPv4(iprange.startIp)
iprange.endIp = iphelper.toIPv4(iprange.endIp)
@@ -27,8 +26,7 @@ router.getAsync('/:id', async (req, res) => {
iprange.startIp = iphelper.toIPv4(iprange.startIp)
iprange.endIp = iphelper.toIPv4(iprange.endIp)
res.status(200).send(iprange)
- }
- else HttpResponse.notFound(req.params.id).send(res)
+ } else HttpResponse.notFound(req.params.id).send(res)
})
// ############################################################################
@@ -67,7 +65,6 @@ router.delete('/:id', async (req, res) => {
else HttpResponse.notFound(req.params.id).send(res)
})
-
// ############################################################################
// ############################################################################
diff --git a/server/api/wakerequests.js b/server/api/wakerequests.js
index 51e49d8..e14501c 100644
--- a/server/api/wakerequests.js
+++ b/server/api/wakerequests.js
@@ -9,7 +9,7 @@ var router = decorateApp(express.Router())
router.postAsync('', async (req, res) => {
const clients = await db.client.findAll({ where: { id: req.body.clients } })
clients.forEach(client => {
- wol.wake(client.mac, { address: client.ip.slice(0, client.ip.lastIndexOf('.') + 1) + '255' }, err => {})
+ wol.wake(client.mac, { address: client.ip.slice(0, client.ip.lastIndexOf('.') + 1) + '255' }, err => console.log(err))
})
res.status(200).end()
})
diff --git a/server/lib/grouputil.js b/server/lib/grouputil.js
index 75da209..8db0c49 100644
--- a/server/lib/grouputil.js
+++ b/server/lib/grouputil.js
@@ -3,7 +3,7 @@ var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
async function getAllChildren (groups) {
- return await getAllChildrenByIds(groups.map(x => x.id), {}, {})
+ return getAllChildrenByIds(groups.map(x => x.id), {}, {})
}
async function getAllChildrenByIds (groupIds, knownGroupMap, knownClientMap) {
diff --git a/webapp/src/components/GroupModuleGroupView.vue b/webapp/src/components/GroupModuleGroupView.vue
index 2f79911..7333c74 100644
--- a/webapp/src/components/GroupModuleGroupView.vue
+++ b/webapp/src/components/GroupModuleGroupView.vue
@@ -241,8 +241,10 @@ export default {
group (newValue, oldValue) {
if (newValue.id === 'create') {
this.editInfo()
+ this.activeTab = 0
} else if (newValue.id !== oldValue.id) {
this.editMode = false
+ this.activeTab = 0
}
}
},