From 5f5b750172db192e2dbcdf356d65fa0ad5490303 Mon Sep 17 00:00:00 2001 From: garrettmills Date: Mon, 2 Nov 2020 22:44:54 -0600 Subject: [PATCH] Clean up page versioning logic to prevent duplicate versions --- app/controllers/api/v1/Page.controller.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/v1/Page.controller.js b/app/controllers/api/v1/Page.controller.js index b5b12c1..1297393 100644 --- a/app/controllers/api/v1/Page.controller.js +++ b/app/controllers/api/v1/Page.controller.js @@ -78,7 +78,7 @@ class Page extends Controller { page.OrgUserId = req.user._id } - let save_message = 'Page contents saved' + let save_message if ( !req.body.Name ) return res.status(400).message('Missing required: Name').api({}) @@ -113,7 +113,11 @@ class Page extends Controller { page.UpdatedAt = new Date page.UpdateUserId = req.user._id - await page.version_save(save_message, req.user.id) + if ( save_message ) { + await page.version_save(save_message, req.user.id) + } else { + await page.save() + } return res.api(page) } @@ -242,7 +246,7 @@ class Page extends Controller { let delete_nodes = nodes for ( const node of updated_nodes ) { - await node.version_save(`Bulk updated in page "${page.Name}"`, req.user.id) + await node.version_save(`Contents saved in page "${page.Name}"`, req.user.id) delete_nodes = delete_nodes.filter(n => { return n.UUID !== node.UUID }) @@ -253,7 +257,7 @@ class Page extends Controller { } page.NodeIds = updated_nodes.map(x => x.UUID) - await page.version_save('Bulk-updated nodes on page', req.user.id) + await page.version_save('Saved page contents', req.user.id) res.api(updated_nodes) }