From 0074acb8fea9177dac4297804db78a4dbd3c13f2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 6 Jan 2015 12:45:08 +0100
Subject: [PATCH] Fix profile info tab

---
 assets/scripts/app/controllers.coffee         | 2 +-
 assets/scripts/app/controllers/profile.coffee | 6 +++++-
 assets/scripts/app/routes.coffee              | 8 +++++---
 assets/scripts/app/views/profile.coffee       | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee
index 7cbb408e..c9653c51 100644
--- a/assets/scripts/app/controllers.coffee
+++ b/assets/scripts/app/controllers.coffee
@@ -30,7 +30,7 @@ Travis.StatsLayoutController = Em.Controller.extend()
 Travis.ProfileLayoutController = Em.Controller.extend()
 Travis.AuthLayoutController = Em.Controller.extend()
 
-Travis.ProfileInfoController = Em.Controller.extend
+Travis.AccountsInfoController = Em.Controller.extend
   needs: ['currentUser', 'repos']
   userBinding: 'controllers.currentUser'
 
diff --git a/assets/scripts/app/controllers/profile.coffee b/assets/scripts/app/controllers/profile.coffee
index a627a960..298f3700 100644
--- a/assets/scripts/app/controllers/profile.coffee
+++ b/assets/scripts/app/controllers/profile.coffee
@@ -16,7 +16,11 @@ Travis.ProfileController = Travis.Controller.extend
     @connectTab('user')
 
   connectTab: (tab) ->
-    viewClass = Travis["#{$.camelize(tab)}View"]
+    if tab == 'user'
+      view = 'AccountsInfoView'
+    else
+      view = "#{$.camelize(tab)}View"
+    viewClass = Travis[view]
     @set('tab', tab)
 
   billingUrl: (->
diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index 5f9b1f1c..838b0252 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -429,12 +429,14 @@ Travis.AccountRoute = Travis.Route.extend
     else
       {}
 
-Travis.ProfileInfoRoute = Travis.Route.extend
+Travis.AccountsInfoRoute = Travis.Route.extend
   setupController: ->
-    @container.lookup('controller:profile').activate 'user'
+    user = @controllerFor('currentUser').get('model')
+    @controllerFor('account').set('model', user)
+    @controllerFor('profile').activate 'user'
 
   renderTemplate: ->
-    @render 'user'
+    @render 'accounts_info'
 
 Travis.AuthRoute = Travis.Route.extend
   needsAuth: false
diff --git a/assets/scripts/app/views/profile.coffee b/assets/scripts/app/views/profile.coffee
index 297a368b..2d852159 100644
--- a/assets/scripts/app/views/profile.coffee
+++ b/assets/scripts/app/views/profile.coffee
@@ -38,7 +38,7 @@ Travis.reopen
       Travis.Urls.githubAdmin(@get('hook.slug'))
     ).property('hook.slug')
 
-  UserView: Travis.View.extend
+  AccountsInfoView: Travis.View.extend
     templateName: 'profile/tabs/user'
     userBinding: 'controller.user'