github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-24 00:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2362 from overleaf/jel-account-linking-default-redirect

Browse source 
Change default redirect after linking to institution

GitOrigin-RevId: a80bd375e5b208c78944257cd31a9bd4b509c3c1
This commit is contained in:
Jessica Lawshe 2019-11-21 09:55:05 -06:00 committed by sharelatex
parent fb0f8ec65f
commit 1882d7af7a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/views/project/list/notifications.pug
View file

@ -60,7 +60,7 @@
p !{translate("can_link_institution_email_acct_to_institution_acct", {appName: settings.appName, email: "{{notification.email}}", institutionName: "{{notification.institutionName}}"})}
div !{translate("doing_this_allow_log_in_through_institution", {appName: settings.appName})}
.notification-action
a.btn.btn-sm.btn-info(href="{{samlInitPath}}?university_id={{notification.institutionId}}&auto=project&email={{notification.email}}")
a.btn.btn-sm.btn-info(href="{{samlInitPath}}?university_id={{notification.institutionId}}&auto=/project&email={{notification.email}}")
| #{translate('link_account')}
.notification-close
button(ng-click="dismiss(notification)").close.pull-right
@ -127,7 +127,7 @@
p !{translate("can_link_institution_email_acct_to_institution_acct", {appName: settings.appName, email: "{{notification.email}}", institutionName: "{{notification.institutionName}}"})}
div !{translate("doing_this_allow_log_in_through_institution", {appName: settings.appName})}
.notification-action
a.btn.btn-sm.btn-info(href="{{samlInitPath}}?university_id={{notification.institutionId}}&auto=project&email={{notification.email}}")
a.btn.btn-sm.btn-info(href="{{samlInitPath}}?university_id={{notification.institutionId}}&auto=/project&email={{notification.email}}")
| #{translate('link_account')}
.notification-close
button(ng-click="dismiss(notification)").close.pull-right

2
services/web/frontend/js/main/affiliations/controllers/UserAffiliationsController.js
View file

@ -121,7 +121,7 @@ define(['base'], App =>
$scope.ui.isProcessing = true
$window.location.href = `${
$scope.samlInitPath
}?university_id=${institutionId}&auto=true&email=${email}`
}?university_id=${institutionId}&auto=/user/settings&email=${email}`
}
$scope.selectUniversityManually = function() {