Merge pull request #813 from sharelatex/ta-enable-affiliations-ui

Enable Affiliations UI
This commit is contained in:
Timothée Alby 2018-08-14 16:40:35 +02:00 committed by GitHub
commit 5e488dcab7
2 changed files with 2 additions and 3 deletions

View file

@ -68,7 +68,6 @@ module.exports =
shouldAllowEditingDetails: shouldAllowEditingDetails
languages: Settings.languages,
accountSettingsTabActive: true
showAffiliationsUI: (req.query?.aff == "true") or false
sessionsPage: (req, res, next) ->
user = AuthenticationController.getSessionUser(req)

View file

@ -9,7 +9,7 @@ block content
.page-header
h1 #{translate("account_settings")}
.account-settings(ng-controller="AccountSettingsController", ng-cloak)
if locals.showAffiliationsUI && hasFeature('affiliations')
if hasFeature('affiliations')
include settings/user-affiliations
form-messages(for="settingsForm")
@ -22,7 +22,7 @@ block content
h3 #{translate("update_account_info")}
form(async-form="settings", name="settingsForm", method="POST", action="/user/settings", novalidate)
input(type="hidden", name="_csrf", value=csrfToken)
if !(locals.showAffiliationsUI && hasFeature('affiliations'))
if !hasFeature('affiliations')
if !externalAuthenticationSystemUsed()
.form-group
label(for='email') #{translate("email")}