suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update loading user to EmberModel's version

Browse Source
This commit is contained in:
Piotr Sarnacki 2013-07-31 13:45:52 +02:00
parent 8daf5b857a
commit 8082d3a6d3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/scripts/app/auth.coffee
View File

@ -80,7 +80,7 @@
refreshUserData: (user) -> refreshUserData: (user) ->
Travis.ajax.get "/users/#{user.id}", (data) => Travis.ajax.get "/users/#{user.id}", (data) =>
Travis.store.loadIncomplete(Travis.User, data.user) Travis.loadOrMerge(Travis.User, data.user)
# if user is still signed in, update saved data # if user is still signed in, update saved data
if @signedIn() if @signedIn()
data.user.token = user.token data.user.token = user.token
@ -95,9 +95,8 @@
storage.setItem('travis.user', JSON.stringify(data.user)) storage.setItem('travis.user', JSON.stringify(data.user))
loadUser: (user) -> loadUser: (user) ->
store = @app.store Travis.loadOrMerge(Travis.User, user)
store.load(Travis.User, user.id, user) user = Travis.User.find(user.id)
user = store.find(Travis.User, user.id)
user.get('permissions') user.get('permissions')
user user