github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-24 00:03:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into master-redesign

Browse source 
Conflicts:
	app/views/project/list.jade
This commit is contained in:
James Allen 2014-06-17 16:21:21 +01:00
commit dac4f09943
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
services/web/public/coffee/app/user-details.coffee
View file

@ -20,10 +20,10 @@ define [
$http.get("/user/personal_info").success (data)->
$scope.userInfoForm =
first_name: data.first_name
last_name: data.last_name
role: data.role
institution: data.institution
first_name: data.first_name || ""
last_name: data.last_name || ""
role: data.role || ""
institution: data.institution || ""
_csrf : window.csrfToken
if getPercentComplete() != 100
@ -41,7 +41,7 @@ define [
$scope.percentComplete = getPercentComplete()
getPercentComplete = ->
results = _.filter $scope.userInfoForm, (value)-> value? and value?.length != 0
results = _.filter $scope.userInfoForm, (value)-> !value? or value?.length != 0
results.length * 20
$scope.updateInstitutionsList = (inputVal)->
@ -53,5 +53,5 @@ define [
Institutions.search $scope.userInfoForm.institution, (err, response)->
$scope.institutions = _.map response.hits, (institution)->
"#{institution.name} (<span class='muted'>#{institution.domain}</span>)"
"#{institution.name} (#{institution.domain})"