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

Sorting correctly related tasks

stable
Jesús Espino 2016-08-19 10:45:25 +02:00 committed by David Barragán Merino
parent 89d9472ae8
commit f5f55889c3
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/related-tasks.coffee
View File

@ -229,7 +229,7 @@ RelatedTasksDirective = ($repo, $rs, $rootscope) ->
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->
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 = _.sortBy(tasks, 'ref') $scope.tasks = _.sortBy(tasks, (x) => [x.us_order, x.ref])
return tasks return tasks
_isVisible = -> _isVisible = ->

2
app/coffee/modules/taskboard/main.coffee
View File

@ -339,7 +339,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
loadTasks: -> loadTasks: ->
params = { params = {
include_attachments: true, include_attachments: true,
include_tasks: true
} }
params = _.merge params, @location.search() params = _.merge params, @location.search()
@ -401,7 +400,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
params = { params = {
status__is_archived: false, status__is_archived: false,
include_attachments: true, include_attachments: true,
include_tasks: true
} }
options = { options = {

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

@ -331,7 +331,7 @@ UsStatusButtonDirective = ($rootScope, $repo, $confirm, $loading, $modelTransfor
$el.html(html) $el.html(html)
$compile($el.contents())($scope); $compile($el.contents())($scope)
save = (status) => save = (status) =>
$el.find(".pop-status").popover().close() $el.find(".pop-status").popover().close()