From 0f7b268cdf7a9e3a9a6820b2e4c7df2e962c5402 Mon Sep 17 00:00:00 2001 From: Jessica Lawshe Date: Mon, 22 Feb 2021 09:01:48 -0600 Subject: [PATCH] Merge pull request #3683 from overleaf/bg-admin-open-editor Allow admin to reopen editor after closing GitOrigin-RevId: 9bf0c4234a9d510785aa4bddbb9f239d678ba503 --- .../web/app/src/Features/ServerAdmin/AdminController.js | 6 ++++++ services/web/app/src/router.js | 5 +++++ services/web/app/views/admin/index.pug | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/services/web/app/src/Features/ServerAdmin/AdminController.js b/services/web/app/src/Features/ServerAdmin/AdminController.js index 83687e7a31..8a04b70e29 100644 --- a/services/web/app/src/Features/ServerAdmin/AdminController.js +++ b/services/web/app/src/Features/ServerAdmin/AdminController.js @@ -107,6 +107,12 @@ const AdminController = { return res.sendStatus(200) }, + openEditor(req, res) { + logger.warn('opening editor') + Settings.editorIsOpen = true + return res.sendStatus(200) + }, + closeEditor(req, res) { logger.warn('closing editor') Settings.editorIsOpen = req.body.isOpen diff --git a/services/web/app/src/router.js b/services/web/app/src/router.js index c4aeec3564..62f27c9337 100644 --- a/services/web/app/src/router.js +++ b/services/web/app/src/router.js @@ -943,6 +943,11 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) { AuthorizationMiddleware.ensureUserIsSiteAdmin, UserController.register ) + webRouter.post( + '/admin/openEditor', + AuthorizationMiddleware.ensureUserIsSiteAdmin, + AdminController.openEditor + ) webRouter.post( '/admin/closeEditor', AuthorizationMiddleware.ensureUserIsSiteAdmin, diff --git a/services/web/app/views/admin/index.pug b/services/web/app/views/admin/index.pug index c6cbe61ce9..a227e9d0f7 100644 --- a/services/web/app/views/admin/index.pug +++ b/services/web/app/views/admin/index.pug @@ -34,7 +34,7 @@ block content each agent in agents li(ng-non-bindable) #{agent} - tab(heading="Close Editor") + tab(heading="Open/Close Editor") .row-spaced form(method='post',action='/admin/closeEditor') input(name="_csrf", type="hidden", value=csrfToken) @@ -47,6 +47,12 @@ block content button.btn.btn-danger(type="submit") Disconnect all users p.small Will force disconnect all users with the editor open. Make sure to close the editor first to avoid them reconnecting. + .row-spaced + form(method='post',action='/admin/openEditor') + input(name="_csrf", type="hidden", value=csrfToken) + button.btn.btn-danger(type="submit") Reopen Editor + p.small Will reopen the editor after closing. + tab(heading="TPDS/Dropbox Management") h3 Flush project to TPDS .row