summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorChristian Hofmaier2019-03-24 17:06:17 +0100
committerChristian Hofmaier2019-03-24 17:06:17 +0100
commit3e413b3f5d793e887b88eaecc12b66faacfc1a43 (patch)
treee0e07a1d82fbc432913ab5fee5f5f1dbeee836ef /server
parent[eventmanager] Add module and functionality (diff)
downloadbas-3e413b3f5d793e887b88eaecc12b66faacfc1a43.tar.gz
bas-3e413b3f5d793e887b88eaecc12b66faacfc1a43.tar.xz
bas-3e413b3f5d793e887b88eaecc12b66faacfc1a43.zip
eslint fix
Diffstat (limited to 'server')
-rw-r--r--server/api/configloader.js12
-rw-r--r--server/api/events.js3
-rw-r--r--server/models/group.js1
3 files changed, 7 insertions, 9 deletions
diff --git a/server/api/configloader.js b/server/api/configloader.js
index 0ede64f..63c0d84 100644
--- a/server/api/configloader.js
+++ b/server/api/configloader.js
@@ -132,8 +132,8 @@ noAuthRouter.get('/getconfig/:configId', (req, res) => {
})
})
-async function fetchParentConfigs(groupIds, blacklist) {
- if (groupIds.length === 0) return {'ids': [], 'type': ''}
+async function fetchParentConfigs (groupIds, blacklist) {
+ if (groupIds.length === 0) return { 'ids': [], 'type': '' }
var importantEvents = []
var events = []
@@ -159,7 +159,7 @@ async function fetchParentConfigs(groupIds, blacklist) {
importantEvents = importantEvents.map(e => e.config)
importantEvents = importantEvents.filter(c => c !== null)
importantEvents = importantEvents.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos })
- if (importantEvents.length > 0) return {'ids': importantEvents, 'type': 'important'}
+ if (importantEvents.length > 0) return { 'ids': importantEvents, 'type': 'important' }
var response = await fetchParentConfigs(parentIds, newBlacklist)
@@ -169,17 +169,17 @@ async function fetchParentConfigs(groupIds, blacklist) {
events = events.map(e => e.config)
events = events.filter(c => c !== null)
events = events.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos })
- if (events.length > 0) return {'ids': events, 'type': 'event'}
+ if (events.length > 0) return { 'ids': events, 'type': 'event' }
if (response.type === 'event') return response
configs = configs.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos })
configs = configs.filter(c => c !== null)
- if (configs.length > 0) return {'ids': configs, 'type': 'config'}
+ if (configs.length > 0) return { 'ids': configs, 'type': 'config' }
if (response.type === 'config') return response
- return {'ids': [], 'type': ''}
+ return { 'ids': [], 'type': '' }
}
// create the config script from database
diff --git a/server/api/events.js b/server/api/events.js
index 96bf15e..585f140 100644
--- a/server/api/events.js
+++ b/server/api/events.js
@@ -35,8 +35,7 @@ router.postAsync('/blacklist', async (req, res) => {
if (req.body.groups) {
var blacklist = await groupUtil.getAllChildren(req.body.groups)
res.send(blacklist)
- }
- else res.status(404).end()
+ } else res.status(404).end()
})
// Create, Update or Delete POST
diff --git a/server/models/group.js b/server/models/group.js
index 6ff9034..0582970 100644
--- a/server/models/group.js
+++ b/server/models/group.js
@@ -22,7 +22,6 @@ module.exports = (sequelize, DataTypes) => {
group.belongsToMany(models.event, { as: 'events', through: GroupXEvent, foreignKey: 'groupId', otherKey: 'eventId' })
group.belongsTo(models.config)
group.hasMany(models.iprange, { as: 'ipranges' })
-
}
return group
}