From c9bc100cc376f5814e984d375f699a102f64b572 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 29 Apr 2015 08:35:35 +0200
Subject: [PATCH] Fixing titles

---
 app/modules/home/home-page.controller.coffee  | 19 ++++++++++++-------
 app/modules/home/home.jade                    |  4 ++--
 .../projects/projects-page.controller.coffee  |  5 ++++-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/modules/home/home-page.controller.coffee b/app/modules/home/home-page.controller.coffee
index ae45ba75..7e813b05 100644
--- a/app/modules/home/home-page.controller.coffee
+++ b/app/modules/home/home-page.controller.coffee
@@ -20,20 +20,25 @@ class ProjectsPageController extends taiga.Controller
     constructor: (@scope, @q, @rs, @rootscope, @navUrls, @auth, @location,
         @appTitle, @projectUrl, @config, tgLoader, @projectsService, @homeService,
         @translate) ->
-        @appTitle.set(@translate.instant("PROJECT.WELCOME"))
 
         if !@auth.isAuthenticated()
             @location.path(@navUrls.resolve("login"))
 
-        #Projects
-        projectsPromise = @projectsService.fetchProjects()
+        promise = @.loadInitialData()
 
-        #In progress work
-        user = @auth.getUser()
-        workInProgressPromise = @homeService.fetchWorkInProgress(user.id)
+        # On Success
+        promise.then =>
+            @appTitle.set(@translate.instant("PROJECT.WELCOME"))
 
         # Finally
-        @q.all([projectsPromise, workInProgressPromise]).finally tgLoader.pageLoaded
+        promise.finally tgLoader.pageLoaded
 
+    loadInitialData: ->
+        user = @auth.getUser()
+        #Projects
+        promise = @projectsService.fetchProjects()
+        return promise.then () =>
+            #In progress work
+            return @homeService.fetchWorkInProgress(user.id)
 
 angular.module("taigaHome").controller("HomePage", ProjectsPageController)
diff --git a/app/modules/home/home.jade b/app/modules/home/home.jade
index b05ea7ab..40f04c9d 100644
--- a/app/modules/home/home.jade
+++ b/app/modules/home/home.jade
@@ -3,8 +3,8 @@ doctype html
 include ../../partials/includes/components/beta
 div.home-wrapper.centered
     div.duty-summary
-        div.title-bar.working-on-title(ng-show="vm.assignedTo", translate="HOME.WORKING_ON_SECTION")
-        section.working-on(ng-show="vm.assignedTo")
+        div.title-bar.working-on-title(ng-show="vm.assignedTo.size", translate="HOME.WORKING_ON_SECTION")
+        section.working-on(ng-show="vm.assignedTo.size")
             div.duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}")
 
         div.title-bar.watching-title(translate="HOME.WATCHING_SECTION")
diff --git a/app/modules/projects/projects-page.controller.coffee b/app/modules/projects/projects-page.controller.coffee
index 67f60490..c91a5880 100644
--- a/app/modules/projects/projects-page.controller.coffee
+++ b/app/modules/projects/projects-page.controller.coffee
@@ -17,7 +17,6 @@ class ProjectsPageController extends taiga.Controller
 
     constructor: (@scope, @q, @rs, @rootscope, @navUrls, @auth, @location,
         @appTitle, @projectUrl, @config, tgLoader, @projectsService, @translate) ->
-        @appTitle.set(@translate.instant("PROJECT.SECTION_PROJECTS"))
 
         if !@auth.isAuthenticated()
             @location.path(@navUrls.resolve("login"))
@@ -25,6 +24,10 @@ class ProjectsPageController extends taiga.Controller
         #Projects
         promise = @projectsService.fetchProjects()
 
+        # On Success
+        promise.then =>
+            @appTitle.set(@translate.instant("PROJECT.SECTION_PROJECTS"))
+            
         # Finally
         promise.finally tgLoader.pageLoaded