diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index 45d78f28..23a471fb 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -80,7 +80,6 @@ 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 index 45e11419..64a73be8 100644 --- a/taiga/projects/userstories/migrations/0013_auto_20160722_1018.py +++ b/taiga/projects/userstories/migrations/0013_auto_20160722_1018.py @@ -12,11 +12,6 @@ class Migration(migrations.Migration): ] 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', diff --git a/taiga/projects/userstories/models.py b/taiga/projects/userstories/models.py index f096c885..d0216d21 100644 --- a/taiga/projects/userstories/models.py +++ b/taiga/projects/userstories/models.py @@ -81,8 +81,6 @@ class UserStory(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, mod verbose_name=_("sprint order")) kanban_order = models.IntegerField(null=False, blank=False, default=10000, 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 f60fb2b6..bc977a2e 100644 --- a/taiga/projects/userstories/serializers.py +++ b/taiga/projects/userstories/serializers.py @@ -61,7 +61,6 @@ class UserStoryListSerializer(ProjectExtraInfoSerializerMixin, backlog_order = Field() sprint_order = Field() kanban_order = Field() - epic_order = Field() created_date = Field() modified_date = Field() finish_date = Field()