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

Fix epic sort when 'order' is the same

remotes/origin/issue/4795/notification_even_they_are_disabled
David Barragán Merino 2016-09-22 13:55:48 +02:00 committed by Alejandro Alonso
parent 7e7c567709
commit 19cd0c5354
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
taiga/projects/userstories/services.py
View File

@ -474,18 +474,7 @@ def _get_userstories_epics(project, queryset):
WHERE {where} WHERE {where}
GROUP BY "epics_relateduserstory"."epic_id" GROUP BY "epics_relateduserstory"."epic_id"
) )
SELECT "epics_epic"."id" AS "id",
"epics_epic"."ref" AS "ref",
"epics_epic"."subject" AS "subject",
"epics_epic"."epics_order" AS "order",
COALESCE("counters"."counter", 0) AS "counter"
FROM "epics_epic"
LEFT OUTER JOIN "counters"
ON ("counters"."epic_id" = "epics_epic"."id")
WHERE "epics_epic"."project_id" = %s
-- User stories with no epics (return results only if there are userstories) -- User stories with no epics (return results only if there are userstories)
UNION
SELECT NULL AS "id", SELECT NULL AS "id",
NULL AS "ref", NULL AS "ref",
NULL AS "subject", NULL AS "subject",
@ -498,6 +487,16 @@ def _get_userstories_epics(project, queryset):
ON ("userstories_userstory"."project_id" = "projects_project"."id") ON ("userstories_userstory"."project_id" = "projects_project"."id")
WHERE {where} AND "epics_relateduserstory"."epic_id" IS NULL WHERE {where} AND "epics_relateduserstory"."epic_id" IS NULL
GROUP BY "epics_relateduserstory"."epic_id" GROUP BY "epics_relateduserstory"."epic_id"
UNION
SELECT "epics_epic"."id" AS "id",
"epics_epic"."ref" AS "ref",
"epics_epic"."subject" AS "subject",
"epics_epic"."epics_order" AS "order",
COALESCE("counters"."counter", 0) AS "counter"
FROM "epics_epic"
LEFT OUTER JOIN "counters"
ON ("counters"."epic_id" = "epics_epic"."id")
WHERE "epics_epic"."project_id" = %s
""".format(where=where) """.format(where=where)
with closing(connection.cursor()) as cursor: with closing(connection.cursor()) as cursor:
@ -514,7 +513,7 @@ def _get_userstories_epics(project, queryset):
"count": count, "count": count,
}) })
result = sorted(result, key=itemgetter("order")) result = sorted(result, key=lambda k: (k["order"], k["id"] or 0))
# Add row when there is no user stories with no epics # Add row when there is no user stories with no epics
if result == [] or result[0]["id"] is not None: if result == [] or result[0]["id"] is not None: