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

Fixed tests (broken in commit 778fce6)

remotes/origin/enhancement/email-actions
David Barragán Merino 2014-03-01 12:42:59 +01:00
parent f386c96028
commit e7ac66f9af
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
taiga/projects/issues/models.py
View File

@ -96,7 +96,11 @@ class Issue(NeighborsMixin, WatchedMixin, BlockedMixin):
def _get_prev_neighbor_filters(self, queryset): def _get_prev_neighbor_filters(self, queryset):
conds = super()._get_prev_neighbor_filters(queryset) conds = super()._get_prev_neighbor_filters(queryset)
try:
main_order = queryset.query.order_by[0] main_order = queryset.query.order_by[0]
except IndexError:
main_order = None
if main_order == "severity": if main_order == "severity":
conds = [{"severity__order__lt": self.severity.order}, conds = [{"severity__order__lt": self.severity.order},
{"severity__order": self.severity.order, {"severity__order": self.severity.order,
@ -166,7 +170,11 @@ class Issue(NeighborsMixin, WatchedMixin, BlockedMixin):
def _get_next_neighbor_filters(self, queryset): def _get_next_neighbor_filters(self, queryset):
conds = super()._get_next_neighbor_filters(queryset) conds = super()._get_next_neighbor_filters(queryset)
ordering = queryset.query.order_by ordering = queryset.query.order_by
try:
main_order = ordering[0] main_order = ordering[0]
except IndexError:
main_order = None
if main_order == "severity": if main_order == "severity":
conds = [{"severity__order__gt": self.severity.order}, conds = [{"severity__order__gt": self.severity.order},
{"severity__order": self.severity.order, {"severity__order": self.severity.order,
@ -217,8 +225,7 @@ class Issue(NeighborsMixin, WatchedMixin, BlockedMixin):
else: else:
conds = [{"assigned_to__isnull": True, conds = [{"assigned_to__isnull": True,
"created_date__gt": self.created_date}] "created_date__gt": self.created_date}]
elif main_order == "-assigned_to__first_name": elif main_order == "-assigned_to__first_name" and self.assigned_to:
if self.assigned_to:
conds = [{"assigned_to__first_name": self.assigned_to.first_name, conds = [{"assigned_to__first_name": self.assigned_to.first_name,
"assigned_to__last_name": self.assigned_to.last_name, "assigned_to__last_name": self.assigned_to.last_name,
"created_date__gt": self.created_date}, "created_date__gt": self.created_date},