From 1882d7af7a1a671953b2ce96ad5454779833cbb2 Mon Sep 17 00:00:00 2001 From: Jessica Lawshe Date: Thu, 21 Nov 2019 09:55:05 -0600 Subject: [PATCH] Merge pull request #2362 from overleaf/jel-account-linking-default-redirect Change default redirect after linking to institution GitOrigin-RevId: a80bd375e5b208c78944257cd31a9bd4b509c3c1 --- services/web/app/views/project/list/notifications.pug | 4 ++-- .../affiliations/controllers/UserAffiliationsController.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/web/app/views/project/list/notifications.pug b/services/web/app/views/project/list/notifications.pug index 33893411a6..9dc1c08c7b 100644 --- a/services/web/app/views/project/list/notifications.pug +++ b/services/web/app/views/project/list/notifications.pug @@ -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 diff --git a/services/web/frontend/js/main/affiliations/controllers/UserAffiliationsController.js b/services/web/frontend/js/main/affiliations/controllers/UserAffiliationsController.js index d2d1d80afc..7caf55e815 100644 --- a/services/web/frontend/js/main/affiliations/controllers/UserAffiliationsController.js +++ b/services/web/frontend/js/main/affiliations/controllers/UserAffiliationsController.js @@ -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() {