From fb673ab844f57ca3edee933788e4bd31e39c20b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Fri, 22 Jul 2016 12:19:56 +0200
Subject: [PATCH] Ability to order stories inside an Epic

---
 taiga/projects/userstories/api.py             |  1 +
 .../migrations/0013_auto_20160722_1018.py     | 25 +++++++++++++++++++
 taiga/projects/userstories/models.py          |  4 ++-
 taiga/projects/userstories/serializers.py     |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 taiga/projects/userstories/migrations/0013_auto_20160722_1018.py

diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py
index 3b6e108a..d391e08f 100644
--- a/taiga/projects/userstories/api.py
+++ b/taiga/projects/userstories/api.py
@@ -83,6 +83,7 @@ class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixi
     order_by_fields = ["backlog_order",
                        "sprint_order",
                        "kanban_order",
+                       "epic_order",
                        "total_voters"]
 
     def get_serializer_class(self, *args, **kwargs):
diff --git a/taiga/projects/userstories/migrations/0013_auto_20160722_1018.py b/taiga/projects/userstories/migrations/0013_auto_20160722_1018.py
new file mode 100644
index 00000000..45e11419
--- /dev/null
+++ b/taiga/projects/userstories/migrations/0013_auto_20160722_1018.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-07-22 10:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('userstories', '0012_auto_20160614_1201'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userstory',
+            name='epic_order',
+            field=models.IntegerField(default=10000, verbose_name='epic order'),
+        ),
+        migrations.AlterField(
+            model_name='userstory',
+            name='kanban_order',
+            field=models.IntegerField(default=10000, verbose_name='kanban order'),
+        ),
+    ]
diff --git a/taiga/projects/userstories/models.py b/taiga/projects/userstories/models.py
index d774e5b4..f096c885 100644
--- a/taiga/projects/userstories/models.py
+++ b/taiga/projects/userstories/models.py
@@ -80,7 +80,9 @@ class UserStory(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, mod
     sprint_order = models.IntegerField(null=False, blank=False, default=10000,
                                        verbose_name=_("sprint order"))
     kanban_order = models.IntegerField(null=False, blank=False, default=10000,
-                                       verbose_name=_("sprint order"))
+                                       verbose_name=_("kanban order"))
+    epic_order = models.IntegerField(null=False, blank=False, default=10000,
+                                     verbose_name=_("epic order"))
 
     created_date = models.DateTimeField(null=False, blank=False,
                                         verbose_name=_("created date"),
diff --git a/taiga/projects/userstories/serializers.py b/taiga/projects/userstories/serializers.py
index bc977a2e..f60fb2b6 100644
--- a/taiga/projects/userstories/serializers.py
+++ b/taiga/projects/userstories/serializers.py
@@ -61,6 +61,7 @@ class UserStoryListSerializer(ProjectExtraInfoSerializerMixin,
     backlog_order = Field()
     sprint_order = Field()
     kanban_order = Field()
+    epic_order = Field()
     created_date = Field()
     modified_date = Field()
     finish_date = Field()