Merge pull request #1093 from taigaio/sorting-correctly-related-tasks

Sorting correctly related tasks
stable
David Barragán Merino 2016-08-23 12:34:46 +02:00 committed by GitHub
commit b929b5ecda
3 changed files with 2 additions and 4 deletions

View File

@ -229,7 +229,7 @@ RelatedTasksDirective = ($repo, $rs, $rootscope) ->
link = ($scope, $el, $attrs) ->
loadTasks = ->
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
_isVisible = ->

View File

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

View File

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