From 111d9428050b3f59339be1460d179193ab586d05 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sun, 14 Apr 2019 02:31:58 +0000 Subject: eslint fixes --- server/api/ipranges.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'server/api/ipranges.js') 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) }) - // ############################################################################ // ############################################################################ -- cgit v1.2.3-55-g7522