Bläddra i källkod

Merge pull request #3683 from overleaf/bg-admin-open-editor

Allow admin to reopen editor after closing

GitOrigin-RevId: 9bf0c4234a9d510785aa4bddbb9f239d678ba503
Jessica Lawshe 5 år sedan
förälder
incheckning
0f7b268cdf

+ 6 - 0
services/web/app/src/Features/ServerAdmin/AdminController.js

@@ -107,6 +107,12 @@ const AdminController = {
     return res.sendStatus(200)
     return res.sendStatus(200)
   },
   },
 
 
+  openEditor(req, res) {
+    logger.warn('opening editor')
+    Settings.editorIsOpen = true
+    return res.sendStatus(200)
+  },
+
   closeEditor(req, res) {
   closeEditor(req, res) {
     logger.warn('closing editor')
     logger.warn('closing editor')
     Settings.editorIsOpen = req.body.isOpen
     Settings.editorIsOpen = req.body.isOpen

+ 5 - 0
services/web/app/src/router.js

@@ -943,6 +943,11 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) {
     AuthorizationMiddleware.ensureUserIsSiteAdmin,
     AuthorizationMiddleware.ensureUserIsSiteAdmin,
     UserController.register
     UserController.register
   )
   )
+  webRouter.post(
+    '/admin/openEditor',
+    AuthorizationMiddleware.ensureUserIsSiteAdmin,
+    AdminController.openEditor
+  )
   webRouter.post(
   webRouter.post(
     '/admin/closeEditor',
     '/admin/closeEditor',
     AuthorizationMiddleware.ensureUserIsSiteAdmin,
     AuthorizationMiddleware.ensureUserIsSiteAdmin,

+ 7 - 1
services/web/app/views/admin/index.pug

@@ -34,7 +34,7 @@ block content
 													each agent in agents
 													each agent in agents
 														li(ng-non-bindable) #{agent}
 														li(ng-non-bindable) #{agent}
 
 
-							tab(heading="Close Editor")
+							tab(heading="Open/Close Editor")
 								.row-spaced
 								.row-spaced
 									form(method='post',action='/admin/closeEditor')
 									form(method='post',action='/admin/closeEditor')
 										input(name="_csrf", type="hidden", value=csrfToken)
 										input(name="_csrf", type="hidden", value=csrfToken)
@@ -47,6 +47,12 @@ block content
 										button.btn.btn-danger(type="submit") Disconnect all users
 										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.
 									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")
 							tab(heading="TPDS/Dropbox Management")
 								h3 Flush project to TPDS
 								h3 Flush project to TPDS
 								.row
 								.row