summaryrefslogtreecommitdiffstats
path: root/server/api
diff options
context:
space:
mode:
authorUdo Walter2019-04-16 14:04:21 +0200
committerUdo Walter2019-04-16 14:04:21 +0200
commitc13a64df857c6540dc23acd8aceeaea05abd6923 (patch)
tree1f7c70fd984adb46b42b2d86803ce0b345e4afa9 /server/api
parent[grouphelper] bugfix (diff)
parent[scheduler] remove console log (diff)
downloadbas-c13a64df857c6540dc23acd8aceeaea05abd6923.tar.gz
bas-c13a64df857c6540dc23acd8aceeaea05abd6923.tar.xz
bas-c13a64df857c6540dc23acd8aceeaea05abd6923.zip
merge
Diffstat (limited to 'server/api')
-rw-r--r--server/api/configloader.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/server/api/configloader.js b/server/api/configloader.js
index facb153..0e64dcf 100644
--- a/server/api/configloader.js
+++ b/server/api/configloader.js
@@ -46,7 +46,7 @@ noAuthRouter.getAsync('/:uuid', async (req, res) => {
}
importantEvents = importantEvents.filter(e => !blacklist.includes(e.id))
- importantEvents = importantEvents.map(e => e.config)
+ importantEvents = importantEvents.map(e => e.configId)
importantEvents = importantEvents.filter(c => c !== null)
importantEvents = importantEvents.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos })
if (importantEvents.length === 1) {
@@ -61,7 +61,7 @@ noAuthRouter.getAsync('/:uuid', async (req, res) => {
}
events = events.filter(e => !blacklist.includes(e.id))
- events = events.map(e => e.config)
+ events = events.map(e => e.configId)
events = events.filter(c => c !== null)
events = events.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos })
@@ -207,7 +207,7 @@ async function fetchParentConfigs (groupIds, blacklist) {
}
importantEvents = importantEvents.filter(e => !newBlacklist.includes(e.id))
- importantEvents = importantEvents.map(e => e.config)
+ importantEvents = importantEvents.map(e => e.configId)
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' }
@@ -217,7 +217,7 @@ async function fetchParentConfigs (groupIds, blacklist) {
if (response.type === 'important') return response
events = events.filter(e => !newBlacklist.includes(e.id))
- events = events.map(e => e.config)
+ events = events.map(e => e.configId)
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' }