github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-17 02:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2467 from overleaf/jel-settings-add-email

Browse source 
Reset new email affiliation when no affiliation

GitOrigin-RevId: 0d18552ed0ad738d549e59004fe831110512e222
This commit is contained in:
Timothée Alby 2020-01-07 12:03:54 +01:00 committed by Copybot
parent bf05d23793
commit b1db115427
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,21 +94,18 @@ define(['base'], App =>
universityDomain
)
} else {
$scope.newAffiliation.university = null
$scope.newAffiliation.department = null
_resetAffiliationSuggestion()
}
return $q.resolve(
`${userInputLocalAndDomain.local}@${universityDomain.hostname}`
)
})
.catch(function() {
$scope.newAffiliation.university = null
$scope.newAffiliation.department = null
_resetAffiliationSuggestion()
return $q.reject(null)
})
} else {
$scope.newAffiliation.university = null
$scope.newAffiliation.department = null
_resetAffiliationSuggestion()
return $q.reject(null)
}
}
@ -123,8 +120,7 @@ define(['base'], App =>
}
$scope.selectUniversityManually = function() {
$scope.newAffiliation.university = null
$scope.newAffiliation.department = null
_resetAffiliationSuggestion()
return ($scope.ui.showManualUniversitySelectionUI = true)
}
@ -261,6 +257,12 @@ define(['base'], App =>
return ($scope.ui.showManualUniversitySelectionUI = false)
}
var _resetAffiliationSuggestion = () => {
$scope.newAffiliation = {
email: $scope.newAffiliation.email
}
}
var _resetMakingRequestType = function() {
$scope.ui.isLoadingEmails = false
$scope.ui.isProcessing = false