load user permissions

This commit is contained in:
Sven Fuchs 2012-10-06 23:40:05 +02:00
parent 6e4413d5a2
commit 25dffc0a7a
8 changed files with 18 additions and 14 deletions

View File

@ -43,7 +43,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-api.git remote: git://github.com/travis-ci/travis-api.git
revision: f7c522278eb7fdc9ccbf96af711fe38fa4fb4674 revision: 8abc3309372e8a9c4e3506cbf45362c49e91b24d
specs: specs:
travis-api (0.0.1) travis-api (0.0.1)
backports (~> 2.5) backports (~> 2.5)
@ -61,7 +61,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: 6be27b79c655f49eaa1468f9156bebdafdb85e52 revision: 94dbbf2fea57b56383e26152ae3a4cece02d2df0
branch: sf-travis-api branch: sf-travis-api
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)

View File

@ -59,7 +59,9 @@
localStorage.setItem('travis.auto_signin', 'true') localStorage.setItem('travis.auto_signin', 'true')
sessionStorage.setItem('travis.user', JSON.stringify(user)) sessionStorage.setItem('travis.user', JSON.stringify(user))
@app.store.load(Travis.User, user) @app.store.load(Travis.User, user)
@app.store.find(Travis.User, user.id) user = @app.store.find(Travis.User, user.id)
user.get('permissions')
user
receiveMessage: (event) -> receiveMessage: (event) ->
if event.origin == @expectedOrigin() if event.origin == @expectedOrigin()

View File

@ -15,13 +15,8 @@ require 'travis/model'
builds: (-> builds: (->
id = @get('id') id = @get('id')
builds = Travis.Build.byRepoId id, event_type: 'push' builds = Travis.Build.byRepoId id, event_type: 'push'
array = Travis.ExpandableRecordArray.create array = Travis.ExpandableRecordArray.create(type: Travis.Build, content: Ember.A([]), store: @get('store'))
type: Travis.Build
content: Ember.A([])
store: @get('store')
array.load(builds) array.load(builds)
array array
).property() ).property()

View File

@ -24,6 +24,13 @@ require 'travis/model'
"https://github.com/#{@get('login')}" "https://github.com/#{@get('login')}"
).property() ).property()
permissions: (->
unless @permissions
@permissions = Ember.ArrayProxy.create()
@ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data).permissions
@permissions
).property()
updateLocale: (locale) -> updateLocale: (locale) ->
@setWithSession('locale', locale) @setWithSession('locale', locale)

View File

@ -12,9 +12,9 @@ jQuery.support.cors = true
endpoint = Travis.config.api_endpoint || '' endpoint = Travis.config.api_endpoint || ''
options = options || {} options = options || {}
if accessToken = Travis.app?.get('auth.accessToken') if token = sessionStorage.getItem('travis.token')
options.headers ||= {} options.headers ||= {}
options.headers['Authorization'] ||= "token #{accessToken}" options.headers['Authorization'] ||= "token #{token}"
options.url = "#{endpoint}#{url}" options.url = "#{endpoint}#{url}"
options.type = method options.type = method

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
a126b5e2 b63092e5