set content on user permissions array proxy

This commit is contained in:
Sven Fuchs 2012-10-08 13:38:13 +02:00
parent 3580952076
commit 41ab0c4cb0
6 changed files with 7 additions and 7 deletions

View File

@ -43,7 +43,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-api.git
revision: d59b3b1c0048a3939af144fd5907a2ccc36da864
revision: fa4c5db39b94234e9a3a87da0b4ccca466e034e2
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: 05ea6a6696b3be32839afcaa126afaf3f2522536
revision: 7c84635b5c180a716150c4300bff3ea8f381248c
branch: sf-travis-api
specs:
travis-core (0.0.1)

View File

@ -26,7 +26,7 @@ require 'travis/model'
permissions: (->
unless @permissions
@permissions = Ember.ArrayProxy.create()
@permissions = Ember.ArrayProxy.create(content: [])
@ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data.permissions)
@permissions
).property()

View File

@ -27,9 +27,9 @@ module Travis::Web
@app = Rack::Builder.app do
use Rack::SSL if config.production?
use Rack::Protection::PathTraversal
use Rack::Deflater if config.deflate?
use Travis::Web::App::Api, config if config.run_api?
use Rack::Deflater if config.deflate?
use Travis::Web::App::Assets, config
use Travis::Web::App::Filter, config
run Travis::Web::App::Files.new

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 @@
7bf96c29
06ff9e3d