From 8f17cf423c7ff711509bbabc5a4d4bcfcafe28da Mon Sep 17 00:00:00 2001 From: Lukas Nowy Date: Sat, 12 Jan 2019 15:19:02 +0100 Subject: [PATCH] rename shoppinglist fix --- express-server/db-connect/db-connect.js | 6 +++++- express-server/routes/index.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js index df11eb2b..aa448830 100644 --- a/express-server/db-connect/db-connect.js +++ b/express-server/db-connect/db-connect.js @@ -70,7 +70,7 @@ async function newShoppinglist(name, description, username, color) { //rename Shoppinglist -async function renameShoppinglist(sl_id, newname, newdescription) { +async function renameShoppinglist(sl_id, newname, newdescription, newcolor) { try { let shoppinglist = await query('SELECT row_to_json("Shoppinglist") AS obj FROM "Shoppinglist" WHERE sl_id = $1;', [sl_id]); @@ -81,6 +81,10 @@ async function renameShoppinglist(sl_id, newname, newdescription) { if(shoppinglist.description != newdescription) { await nonQuery('UPDATE "Shoppinglist" SET description = $1 WHERE sl_id = $2;', [newdescription, sl_id]); } + + if(shoppinglist.color != newcolor) { + await nonQuery('UPDATE "Shoppinglist" SET color = $1 WHERE sl_id = $2;', [newcolor, sl_id]); + } } catch (error) { diff --git a/express-server/routes/index.js b/express-server/routes/index.js index aa0eead4..7966599e 100644 --- a/express-server/routes/index.js +++ b/express-server/routes/index.js @@ -213,7 +213,7 @@ router.get("/userinfo_json", (req, res) => { //Rename Shoppinglist router.put("/renamelist", async (req, res) => { try { - res.status(200).send(await postgres.renameShoppinglist(req.body.sl_id, req.body.name, req.body.description)); + res.status(200).send(await postgres.renameShoppinglist(req.body.sl_id, req.body.name, req.body.description, req.body.color)); } catch(err) {