Changeset f52f909 for remit/vouchers

Timestamp:

May 31, 2010, 5:17:26 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

5e6ab71

Parents:

6e43384

git-author:

Alex Dehnert <adehnert@…> (05/31/10 05:08:25)

git-committer:

Alex Dehnert <adehnert@…> (05/31/10 05:17:26)

Message:

Allow sorting requests (Trac: #39)

Location:

remit/vouchers

Files:

• models.py (modified) (1 diff)
• views.py (modified) (3 diffs)

remit/vouchers/models.py

@@ -40 +40 @@
             ('can_email', 'Can send mail about requests',),
         )
+        ordering = ['id', ]
 
     def __unicode__(self, ):

remit/vouchers/views.py

@@ -344 +344 @@
     return Q(submitter=user.username) | Q(check_to_email=user.email)
 
+request_list_orders = (
+#   Name            Label               Columns
+    ('default',     'Default',          ()),
+    ('id',          'ID',               ('id', )),
+    ('state',       'Approval Status',  ('approval_status', )),
+    ('stateamount', 'Approval Status, then amount',  ('approval_status', 'amount', )),
+    ('stateto',     'Approval Status, then recipient',  ('approval_status', 'check_to_first_name', 'check_to_last_name', )),
+    ('statesubmit', 'Approval Status, then submitter',  ('approval_status', 'submitter', )),
+    ('name',        'Request Name',     ('name', )),
+    ('amount',      'Amount',           ('amount', )),
+    ('check_to',    'Check Recipient',  ('check_to_first_name', 'check_to_last_name', )),
+    ('submitter',   'Submitter',        ('submitter', )),
+)
+
 @login_required
 def show_requests(request, ):
@@ -353 +367 @@
         useronly = True
 
+    if 'order' in request.REQUEST:
+        order_row = [row for row in request_list_orders if row[0] == request.REQUEST['order']]
+        if order_row:
+            order, label, cols = order_row[0]
+            qs = qs.order_by(*cols)
+        else:
+            raise Http404('Order by constraint not known')
+    else:
+        order = 'default'
+
+
     return list_detail.object_list(
         request,
@@ -358 +383 @@
         extra_context={
             'useronly': useronly,
+            'order'   : order,
+            'orders'  : request_list_orders,
             'pagename': 'list_requests',
         },