From d1e3a33426bfdb0b10f8081e6f98f2a131219189 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Sun, 29 Mar 2020 16:01:51 +0000 Subject: [permissionmanager] fix bug blacklist getting deleted when resaving --- server/api/roles.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'server') diff --git a/server/api/roles.js b/server/api/roles.js index 5b878f0..c7726b8 100644 --- a/server/api/roles.js +++ b/server/api/roles.js @@ -124,11 +124,10 @@ router.postAsync(['', '/:id'], async (req, res) => { // Update existing role roleDb = await db.role.findOne({ where: { id: req.params.id } }) if (roleDb !== null) { - promises.push(roleDb.update({ name: req.body.name, descr: req.body.description })) - promises.push(roleDb.setPermissions(req.body.permissions)) - promises.push(roleDb.setGroups(req.body.groups, { through: { blacklist: 0 } })) - promises.push(roleDb.addGroups(req.body.blacklist, { through: { blacklist: 1 } })) - await Promise.all(promises) + await roleDb.update({ name: req.body.name, descr: req.body.description }) + await roleDb.setPermissions(req.body.permissions) + await roleDb.setGroups(req.body.groups, { through: { blacklist: 0 } }) + await roleDb.addGroups(req.body.blacklist, { through: { blacklist: 1 } }) log({ category: 'ROLE_EDIT', description: '[' + roleDb.id + '] ' + roleDb.name + ': Role successfully edited.\n' + -- cgit v1.2.3-55-g7522