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

Merge branch 'master' of github.com:travis-ci/travis-ember

Browse Source 
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
This commit is contained in:
Sven Fuchs 2012-09-25 19:23:03 +02:00
commit c2fdbea175
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -35,7 +35,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-api.git remote: git://github.com/travis-ci/travis-api.git
revision: e8d2604ec3e466856f64f20c42b03829d7cff996 revision: 97e06c556f038b5acfea7771ccb7328fac976629
specs: specs:
travis-api (0.0.1) travis-api (0.0.1)
backports (~> 2.5) backports (~> 2.5)

3
assets/javascripts/app/auth.coffee
View File

@ -38,7 +38,6 @@
sessionStorage?.clear() sessionStorage?.clear()
@setUser() @setUser()
setUser: (data) -> setUser: (data) ->
data = JSON.parse(data) if typeof data == 'string' data = JSON.parse(data) if typeof data == 'string'
user = @storeUser(data) if data user = @storeUser(data) if data
@ -46,9 +45,9 @@
@set('user', if user then user else undefined) @set('user', if user then user else undefined)
storeUser: (data) -> storeUser: (data) ->
data.user.access_token ||= data.token # TODO why's the access_token not set on the user?
localStorage?.setItem('travis.auto_signin', 'true') localStorage?.setItem('travis.auto_signin', 'true')
sessionStorage?.setItem('travis.user', JSON.stringify(data)) sessionStorage?.setItem('travis.user', JSON.stringify(data))
data.user.access_token = data.token # TODO why's the access_token not set on the user?
@store.load(Travis.User, data.user) @store.load(Travis.User, data.user)
@store.loadMany(Travis.Account, data.accounts) @store.loadMany(Travis.Account, data.accounts)
Travis.User.find(data.user.id) Travis.User.find(data.user.id)