github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 02:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3836 from overleaf/jpa-no-close-editor-in-saas

Browse source 
[views] admin: the open/close editor feature is not available in SAAS

GitOrigin-RevId: 6d9ba22e7843be7c27084a6bb5bc1c502ecdccc9
This commit is contained in:
Jakob Ackermann 2021-03-30 13:10:27 +02:00 committed by Copybot
parent 57cd6b4754
commit 60cefae09a
3 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/src/infrastructure/Features.js
View file

@ -52,6 +52,8 @@ const Features = {
*/
hasFeature(feature) {
switch (feature) {
case 'saas':
return Boolean(Settings.overleaf)
case 'homepage':
return Boolean(Settings.enableHomepage)
case 'registration':

32
services/web/app/src/router.js
View file

@ -943,21 +943,23 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) {
AuthorizationMiddleware.ensureUserIsSiteAdmin,
UserController.register
)
webRouter.post(
'/admin/openEditor',
AuthorizationMiddleware.ensureUserIsSiteAdmin,
AdminController.openEditor
)
webRouter.post(
'/admin/closeEditor',
AuthorizationMiddleware.ensureUserIsSiteAdmin,
AdminController.closeEditor
)
webRouter.post(
'/admin/disconnectAllUsers',
AuthorizationMiddleware.ensureUserIsSiteAdmin,
AdminController.disconnectAllUsers
)
if (!Features.hasFeature('saas')) {
webRouter.post(
'/admin/openEditor',
AuthorizationMiddleware.ensureUserIsSiteAdmin,
AdminController.openEditor
)
webRouter.post(
'/admin/closeEditor',
AuthorizationMiddleware.ensureUserIsSiteAdmin,
AdminController.closeEditor
)
webRouter.post(
'/admin/disconnectAllUsers',
AuthorizationMiddleware.ensureUserIsSiteAdmin,
AdminController.disconnectAllUsers
)
}
webRouter.post(
'/admin/flushProjectToTpds',
AuthorizationMiddleware.ensureUserIsSiteAdmin,

33
services/web/app/views/admin/index.pug
View file

@ -35,23 +35,26 @@ block content
li(ng-non-bindable) #{agent}
tab(heading="Open/Close Editor")
.row-spaced
form(method='post',action='/admin/closeEditor')
input(name="_csrf", type="hidden", value=csrfToken)
button.btn.btn-danger(type="submit") Close Editor
p.small Will stop anyone opening the editor. Will NOT disconnect already connected users.
if hasFeature('saas')
| The "Open/Close Editor" feature is not available in SAAS.
else
.row-spaced
form(method='post',action='/admin/closeEditor')
input(name="_csrf", type="hidden", value=csrfToken)
button.btn.btn-danger(type="submit") Close Editor
p.small Will stop anyone opening the editor. Will NOT disconnect already connected users.
.row-spaced
form(method='post',action='/admin/disconnectAllUsers')
input(name="_csrf", type="hidden", value=csrfToken)
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/disconnectAllUsers')
input(name="_csrf", type="hidden", value=csrfToken)
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.
.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