taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

👊 💥 💩 💩 💩 🚽

stable
David Barragán Merino 2014-10-24 16:05:18 +02:00
parent fd677ea84d
commit d251b07be0
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/coffee/modules/tasks/detail.coffee
View File

@ -97,14 +97,19 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
ref: @scope.task.neighbors.next.ref ref: @scope.task.neighbors.next.ref
} }
@scope.nextUrl = @navUrls.resolve("project-tasks-detail", ctx) @scope.nextUrl = @navUrls.resolve("project-tasks-detail", ctx)
return task
if task.milestone loadSprint: ->
@rs.sprints.get(task.project, task.milestone).then (sprint) => if @scope.task.milestone
return @rs.sprints.get(@scope.task.project, @scope.task.milestone).then (sprint) =>
@scope.sprint = sprint @scope.sprint = sprint
return sprint
if task.user_story loadUserStory: ->
@rs.userstories.get(task.project, task.user_story).then (us) => if @scope.task.user_story
return @rs.userstories.get(@scope.task.project, @scope.task.user_story).then (us) =>
@scope.us = us @scope.us = us
return us
loadInitialData: -> loadInitialData: ->
params = { params = {
@ -119,7 +124,8 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
return promise.then(=> @.loadProject()) return promise.then(=> @.loadProject())
.then(=> @.loadUsersAndRoles()) .then(=> @.loadUsersAndRoles())
.then(=> @.loadTask()) .then(=> @.loadTask().then(=> @q.all([@.loadUserStory(),
@.loadSprint()])))
module.controller("TaskDetailController", TaskDetailController) module.controller("TaskDetailController", TaskDetailController)

12
app/coffee/modules/userstories/detail.coffee
View File

@ -110,12 +110,14 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
} }
@scope.nextUrl = @navUrls.resolve("project-userstories-detail", ctx) @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 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: -> loadTasks: ->
return @rs.tasks.list(@scope.projectId, null, @scope.usId).then (tasks) => return @rs.tasks.list(@scope.projectId, null, @scope.usId).then (tasks) =>
@scope.tasks = tasks @scope.tasks = tasks
@ -134,7 +136,7 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
return promise.then(=> @.loadProject()) return promise.then(=> @.loadProject())
.then(=> @.loadUsersAndRoles()) .then(=> @.loadUsersAndRoles())
.then(=> @q.all([@.loadUs(), .then(=> @q.all([@.loadUs().then(=> @.loadSprint()),
@.loadTasks()])) @.loadTasks()]))
module.controller("UserStoryDetailController", UserStoryDetailController) module.controller("UserStoryDetailController", UserStoryDetailController)