From 37a50e295a5147670657663d40597dd44e07b22b Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 1 Jul 2021 13:41:17 +0200 Subject: [PATCH] [ServerPro] Removed SaaS views in admin panel and user settings (#4263) * Removed SaaS views from SP admin panel and user settings * Hiding must reconfirm for server pro and restored site admin * Removed empty 'security' section GitOrigin-RevId: 9ad8e2b7510cf957ccf3f968a53fa88d3174a64b --- services/web/app/views/admin/index.pug | 41 ++++++++++++------------ services/web/app/views/user/settings.pug | 6 ++-- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/services/web/app/views/admin/index.pug b/services/web/app/views/admin/index.pug index 39ea393938..a2dd4a8d1b 100644 --- a/services/web/app/views/admin/index.pug +++ b/services/web/app/views/admin/index.pug @@ -56,26 +56,27 @@ block content button.btn.btn-danger(type="submit") Reopen Editor p.small Will reopen the editor after closing. - tab(heading="TPDS/Dropbox Management" bookmarkable-tab="tpds") - h3 Flush project to TPDS - .row - form.col-xs-6(method='post',action='/admin/flushProjectToTpds') - input(name="_csrf", type="hidden", value=csrfToken) - .form-group - label(for='project_id') project_id - input.form-control(type='text', name='project_id', placeholder='project_id', required) - .form-group - button.btn-primary.btn(type='submit') Flush - hr - h3 Poll Dropbox for user - .row - form.col-xs-6(method='post',action='/admin/pollDropboxForUser') - input(name="_csrf", type="hidden", value=csrfToken) - .form-group - label(for='user_id') user_id - input.form-control(type='text', name='user_id', placeholder='user_id', required) - .form-group - button.btn-primary.btn(type='submit') Poll + if hasFeature('saas') + tab(heading="TPDS/Dropbox Management" bookmarkable-tab="tpds") + h3 Flush project to TPDS + .row + form.col-xs-6(method='post',action='/admin/flushProjectToTpds') + input(name="_csrf", type="hidden", value=csrfToken) + .form-group + label(for='project_id') project_id + input.form-control(type='text', name='project_id', placeholder='project_id', required) + .form-group + button.btn-primary.btn(type='submit') Flush + hr + h3 Poll Dropbox for user + .row + form.col-xs-6(method='post',action='/admin/pollDropboxForUser') + input(name="_csrf", type="hidden", value=csrfToken) + .form-group + label(for='user_id') user_id + input.form-control(type='text', name='user_id', placeholder='user_id', required) + .form-group + button.btn-primary.btn(type='submit') Poll tab(heading="Advanced" bookmarkable-tab="advanced") .row-spaced diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index a948cf2bcb..2e86894ffc 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -184,10 +184,8 @@ block content hr include settings/user-oauth - hr - - if !externalAuthenticationSystemUsed() || (settings.createV1AccountOnLogin && settings.overleaf) - + if hasFeature('saas') && (!externalAuthenticationSystemUsed() || (settings.createV1AccountOnLogin && settings.overleaf)) + hr p.small | #{translate("newsletter_info_and_unsubscribe")} a(