diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee index 9f5375ab..475e997d 100644 --- a/assets/scripts/app/controllers.coffee +++ b/assets/scripts/app/controllers.coffee @@ -18,16 +18,11 @@ Travis.MainController = Em.Controller.extend() Travis.StatsLayoutController = Em.Controller.extend() Travis.ProfileLayoutController = Em.Controller.extend() Travis.AuthLayoutController = Em.Controller.extend() -Travis.CurrentUserController = Em.ObjectController.extend() Travis.AccountProfileController = Em.Controller.extend needs: ['currentUser'] userBinding: 'controllers.currentUser' -Travis.AccountIndexController = Em.Controller.extend - needs: ['profile'] - hooksBinding: 'controllers.profile.hooks' - require 'controllers/accounts' require 'controllers/build' require 'controllers/builds' @@ -40,3 +35,6 @@ require 'controllers/repo' require 'controllers/running_jobs' require 'controllers/sidebar' require 'controllers/stats' +require 'controllers/current_user' +require 'controllers/account_index' + diff --git a/assets/scripts/app/controllers/account_index.coffee b/assets/scripts/app/controllers/account_index.coffee new file mode 100644 index 00000000..825d8586 --- /dev/null +++ b/assets/scripts/app/controllers/account_index.coffee @@ -0,0 +1,7 @@ +Travis.AccountIndexController = Em.Controller.extend + needs: ['profile', 'currentUser'] + hooksBinding: 'controllers.profile.hooks' + userBinding: 'controllers.currentUser' + + sync: -> + @get('user').sync() diff --git a/assets/scripts/app/controllers/current_user.coffee b/assets/scripts/app/controllers/current_user.coffee new file mode 100644 index 00000000..548e06a5 --- /dev/null +++ b/assets/scripts/app/controllers/current_user.coffee @@ -0,0 +1,3 @@ +Travis.CurrentUserController = Em.ObjectController.extend + sync: -> + @get('content').sync() diff --git a/assets/scripts/app/controllers/profile.coffee b/assets/scripts/app/controllers/profile.coffee index 84b7fd4f..d121107b 100644 --- a/assets/scripts/app/controllers/profile.coffee +++ b/assets/scripts/app/controllers/profile.coffee @@ -20,6 +20,9 @@ Travis.ProfileController = Travis.Controller.extend account ).property('accounts.length', 'params.login') + sync: -> + @get('user').sync() + activate: (action, params) -> @setParams(params || @get('params')) this["view#{$.camelize(action)}"]() diff --git a/assets/scripts/app/templates/profile/tabs/hooks.hbs b/assets/scripts/app/templates/profile/tabs/hooks.hbs index 46560e83..05f2e84b 100644 --- a/assets/scripts/app/templates/profile/tabs/hooks.hbs +++ b/assets/scripts/app/templates/profile/tabs/hooks.hbs @@ -10,7 +10,7 @@ {{else}}