From 8082d3a6d3a9f16c3ee57c32baa8e7599ce20fbc Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 31 Jul 2013 13:45:52 +0200
Subject: [PATCH] Update loading user to EmberModel's version

---
 assets/scripts/app/auth.coffee | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee
index 44913548..fe9b2832 100644
--- a/assets/scripts/app/auth.coffee
+++ b/assets/scripts/app/auth.coffee
@@ -80,7 +80,7 @@
 
   refreshUserData: (user) ->
     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 @signedIn()
         data.user.token = user.token
@@ -95,9 +95,8 @@
     storage.setItem('travis.user', JSON.stringify(data.user))
 
   loadUser: (user) ->
-    store = @app.store
-    store.load(Travis.User, user.id, user)
-    user = store.find(Travis.User, user.id)
+    Travis.loadOrMerge(Travis.User, user)
+    user = Travis.User.find(user.id)
     user.get('permissions')
     user