From d251b07be0af4488b067ab38703fa5daf96fd46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Fri, 24 Oct 2014 16:05:18 +0200
Subject: [PATCH] :punch: :boom: :poop: :poop: :poop: :toilet:

---
 app/coffee/modules/tasks/detail.coffee       | 20 +++++++++++++-------
 app/coffee/modules/userstories/detail.coffee | 12 +++++++-----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee
index 7b4efdc6..8b00d75e 100644
--- a/app/coffee/modules/tasks/detail.coffee
+++ b/app/coffee/modules/tasks/detail.coffee
@@ -97,14 +97,19 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
                     ref: @scope.task.neighbors.next.ref
                 }
                 @scope.nextUrl = @navUrls.resolve("project-tasks-detail", ctx)
+            return task
 
-            if task.milestone
-                @rs.sprints.get(task.project, task.milestone).then (sprint) =>
-                    @scope.sprint = sprint
+    loadSprint: ->
+        if @scope.task.milestone
+            return @rs.sprints.get(@scope.task.project, @scope.task.milestone).then (sprint) =>
+                @scope.sprint = sprint
+                return sprint
 
-            if task.user_story
-                @rs.userstories.get(task.project, task.user_story).then (us) =>
-                    @scope.us = us
+    loadUserStory: ->
+        if @scope.task.user_story
+            return @rs.userstories.get(@scope.task.project, @scope.task.user_story).then (us) =>
+                @scope.us = us
+                return us
 
     loadInitialData: ->
         params = {
@@ -119,7 +124,8 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
 
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
-                      .then(=> @.loadTask())
+                      .then(=> @.loadTask().then(=> @q.all([@.loadUserStory(),
+                                                            @.loadSprint()])))
 
 module.controller("TaskDetailController", TaskDetailController)
 
diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee
index 863268b4..24981e0c 100644
--- a/app/coffee/modules/userstories/detail.coffee
+++ b/app/coffee/modules/userstories/detail.coffee
@@ -110,12 +110,14 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
                 }
                 @scope.nextUrl = @navUrls.resolve("project-userstories-detail", ctx)
 
-            if us.milestone
-                @rs.sprints.get(us.project, us.milestone).then (sprint) =>
-                    @scope.sprint = sprint
-
             return us
 
+    loadSprint: ->
+        if @scope.us.milestone
+            return @rs.sprints.get(@scope.us.project, @scope.us.milestone).then (sprint) =>
+                @scope.sprint = sprint
+                return sprint
+
     loadTasks: ->
         return @rs.tasks.list(@scope.projectId, null, @scope.usId).then (tasks) =>
             @scope.tasks = tasks
@@ -134,7 +136,7 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
 
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
-                      .then(=> @q.all([@.loadUs(),
+                      .then(=> @q.all([@.loadUs().then(=> @.loadSprint()),
                                        @.loadTasks()]))
 
 module.controller("UserStoryDetailController", UserStoryDetailController)