load user permissions
This commit is contained in:
parent
6e4413d5a2
commit
25dffc0a7a
|
@ -43,7 +43,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/travis-ci/travis-api.git
|
||||
revision: f7c522278eb7fdc9ccbf96af711fe38fa4fb4674
|
||||
revision: 8abc3309372e8a9c4e3506cbf45362c49e91b24d
|
||||
specs:
|
||||
travis-api (0.0.1)
|
||||
backports (~> 2.5)
|
||||
|
@ -61,7 +61,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/travis-ci/travis-core.git
|
||||
revision: 6be27b79c655f49eaa1468f9156bebdafdb85e52
|
||||
revision: 94dbbf2fea57b56383e26152ae3a4cece02d2df0
|
||||
branch: sf-travis-api
|
||||
specs:
|
||||
travis-core (0.0.1)
|
||||
|
|
|
@ -59,7 +59,9 @@
|
|||
localStorage.setItem('travis.auto_signin', 'true')
|
||||
sessionStorage.setItem('travis.user', JSON.stringify(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) ->
|
||||
if event.origin == @expectedOrigin()
|
||||
|
|
|
@ -15,13 +15,8 @@ require 'travis/model'
|
|||
builds: (->
|
||||
id = @get('id')
|
||||
builds = Travis.Build.byRepoId id, event_type: 'push'
|
||||
array = Travis.ExpandableRecordArray.create
|
||||
type: Travis.Build
|
||||
content: Ember.A([])
|
||||
store: @get('store')
|
||||
|
||||
array = Travis.ExpandableRecordArray.create(type: Travis.Build, content: Ember.A([]), store: @get('store'))
|
||||
array.load(builds)
|
||||
|
||||
array
|
||||
).property()
|
||||
|
||||
|
|
|
@ -24,6 +24,13 @@ require 'travis/model'
|
|||
"https://github.com/#{@get('login')}"
|
||||
).property()
|
||||
|
||||
permissions: (->
|
||||
unless @permissions
|
||||
@permissions = Ember.ArrayProxy.create()
|
||||
@ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data).permissions
|
||||
@permissions
|
||||
).property()
|
||||
|
||||
updateLocale: (locale) ->
|
||||
@setWithSession('locale', locale)
|
||||
|
||||
|
|
|
@ -12,9 +12,9 @@ jQuery.support.cors = true
|
|||
endpoint = Travis.config.api_endpoint || ''
|
||||
options = options || {}
|
||||
|
||||
if accessToken = Travis.app?.get('auth.accessToken')
|
||||
if token = sessionStorage.getItem('travis.token')
|
||||
options.headers ||= {}
|
||||
options.headers['Authorization'] ||= "token #{accessToken}"
|
||||
options.headers['Authorization'] ||= "token #{token}"
|
||||
|
||||
options.url = "#{endpoint}#{url}"
|
||||
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
|
@ -1 +1 @@
|
|||
a126b5e2
|
||||
b63092e5
|
Loading…
Reference in New Issue
Block a user