From 044ad0b090fd80b65d5c120dea5d603bf8276a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 24 Sep 2014 19:41:30 +0200 Subject: [PATCH] Fix bug #1088: Incorrect order of USs in backlog page --- app/coffee/modules/backlog/main.coffee | 8 +++++++- app/partials/views/components/backlog-row.jade | 2 +- app/partials/views/modules/sprints.jade | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index de7b422e..a359e770 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -116,6 +116,10 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F loadSprints: -> return @rs.sprints.list(@scope.projectId).then (sprints) => + # NOTE: Fix order of USs because the filter orderBy does not work propertly in partials files + for sprint in sprints + sprint.user_stories = _.sortBy(sprint.user_stories, "sprint_order") + @scope.sprints = sprints @scope.sprintsCounter = sprints.length @scope.sprintsById = groupBy(sprints, (x) -> x.id) @@ -147,7 +151,9 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F return @rs.userstories.listUnassigned(@scope.projectId, @scope.httpParams) return promise.then (userstories) => - @scope.userstories = userstories + # NOTE: Fix order of USs because the filter orderBy does not work propertly in the partials files + @scope.userstories = _.sortBy(userstories, "backlog_order") + @.generateFilters() @.filterVisibleUserstories() diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade index 4e3a84e6..eac81cd4 100644 --- a/app/partials/views/components/backlog-row.jade +++ b/app/partials/views/components/backlog-row.jade @@ -1,4 +1,4 @@ -div.row.us-item-row(ng-repeat="us in visibleUserstories|orderBy:order track by us.id", tg-draggable, ng-class="{blocked: us.is_blocked}") +div.row.us-item-row(ng-repeat="us in visibleUserstories track by us.id", tg-draggable, ng-class="{blocked: us.is_blocked}") div.user-stories div.tags-block(tg-colorize-tags="us.tags", tg-colorize-tags-type="backlog") div.user-story-name diff --git a/app/partials/views/modules/sprints.jade b/app/partials/views/modules/sprints.jade index afd73ec6..0f8b5c58 100644 --- a/app/partials/views/modules/sprints.jade +++ b/app/partials/views/modules/sprints.jade @@ -28,7 +28,7 @@ section.sprints span.description total div.sprint-progress-bar(tg-progress-bar="100 * sprint.closed_points / total_points") div.sprint-table(tg-sprint-sortable) - div.row.milestone-us-item-row(ng-repeat="us in sprint.user_stories|orderBy:order track by us.id") + div.row.milestone-us-item-row(ng-repeat="us in sprint.user_stories track by us.id") div.column-us.width-8 a.us-name.clickable(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", title="") span(tg-bo-ref="us.ref")