Merge branch 'ps-ember-update' of github.com:travis-ci/travis-web into ps-ember-update
This commit is contained in:
commit
f00ad52ad8
|
@ -18,16 +18,11 @@ Travis.MainController = Em.Controller.extend()
|
||||||
Travis.StatsLayoutController = Em.Controller.extend()
|
Travis.StatsLayoutController = Em.Controller.extend()
|
||||||
Travis.ProfileLayoutController = Em.Controller.extend()
|
Travis.ProfileLayoutController = Em.Controller.extend()
|
||||||
Travis.AuthLayoutController = Em.Controller.extend()
|
Travis.AuthLayoutController = Em.Controller.extend()
|
||||||
Travis.CurrentUserController = Em.ObjectController.extend()
|
|
||||||
|
|
||||||
Travis.AccountProfileController = Em.Controller.extend
|
Travis.AccountProfileController = Em.Controller.extend
|
||||||
needs: ['currentUser']
|
needs: ['currentUser']
|
||||||
userBinding: 'controllers.currentUser'
|
userBinding: 'controllers.currentUser'
|
||||||
|
|
||||||
Travis.AccountIndexController = Em.Controller.extend
|
|
||||||
needs: ['profile']
|
|
||||||
hooksBinding: 'controllers.profile.hooks'
|
|
||||||
|
|
||||||
require 'controllers/accounts'
|
require 'controllers/accounts'
|
||||||
require 'controllers/build'
|
require 'controllers/build'
|
||||||
require 'controllers/builds'
|
require 'controllers/builds'
|
||||||
|
@ -40,3 +35,6 @@ require 'controllers/repo'
|
||||||
require 'controllers/running_jobs'
|
require 'controllers/running_jobs'
|
||||||
require 'controllers/sidebar'
|
require 'controllers/sidebar'
|
||||||
require 'controllers/stats'
|
require 'controllers/stats'
|
||||||
|
require 'controllers/current_user'
|
||||||
|
require 'controllers/account_index'
|
||||||
|
|
||||||
|
|
7
assets/scripts/app/controllers/account_index.coffee
Normal file
7
assets/scripts/app/controllers/account_index.coffee
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
Travis.AccountIndexController = Em.Controller.extend
|
||||||
|
needs: ['profile', 'currentUser']
|
||||||
|
hooksBinding: 'controllers.profile.hooks'
|
||||||
|
userBinding: 'controllers.currentUser'
|
||||||
|
|
||||||
|
sync: ->
|
||||||
|
@get('user').sync()
|
3
assets/scripts/app/controllers/current_user.coffee
Normal file
3
assets/scripts/app/controllers/current_user.coffee
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
Travis.CurrentUserController = Em.ObjectController.extend
|
||||||
|
sync: ->
|
||||||
|
@get('content').sync()
|
|
@ -20,6 +20,9 @@ Travis.ProfileController = Travis.Controller.extend
|
||||||
account
|
account
|
||||||
).property('accounts.length', 'params.login')
|
).property('accounts.length', 'params.login')
|
||||||
|
|
||||||
|
sync: ->
|
||||||
|
@get('user').sync()
|
||||||
|
|
||||||
activate: (action, params) ->
|
activate: (action, params) ->
|
||||||
@setParams(params || @get('params'))
|
@setParams(params || @get('params'))
|
||||||
this["view#{$.camelize(action)}"]()
|
this["view#{$.camelize(action)}"]()
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
{{else}}
|
{{else}}
|
||||||
<p class="message">
|
<p class="message">
|
||||||
Last synchronized from GitHub: {{formatTime user.syncedAt}}
|
Last synchronized from GitHub: {{formatTime user.syncedAt}}
|
||||||
<a class="sync_now button" {{action sync target="user"}}>
|
<a class="sync_now button" {{action sync}}>
|
||||||
Sync now
|
Sync now
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user