Fix #628 -- Sorting of filtered order list (#631)

* fix sorting of filtered order list

fixes #628

* implement comments on pr
This commit is contained in:
Jakob Schnell
2017-10-02 14:55:02 +02:00
committed by Raphael Michel
parent 457901ff82
commit fd5d5ae98e
2 changed files with 10 additions and 7 deletions

View File

@@ -93,10 +93,16 @@ class OrderFilterForm(FilterForm):
else:
qs = qs.filter(status=s)
if fdata.get('ordering'):
qs = qs.order_by(dict(self.fields['ordering'].choices)[fdata.get('ordering')])
return qs
class EventOrderFilterForm(OrderFilterForm):
orders = {'code': 'code', 'email': 'email', 'total': 'total',
'datetime': 'datetime', 'status': 'status', 'pcnt': 'pcnt'}
item = forms.ModelChoiceField(
label=_('Products'),
queryset=Item.objects.none(),
@@ -157,6 +163,10 @@ class EventOrderFilterForm(OrderFilterForm):
class OrderSearchFilterForm(OrderFilterForm):
orders = {'code': 'code', 'email': 'email', 'total': 'total',
'datetime': 'datetime', 'status': 'status', 'pcnt': 'pcnt',
'event': 'event'}
organizer = forms.ModelChoiceField(
label=_('Organizer'),
queryset=Organizer.objects.none(),