Changeset 5e6ab71 for remit

Timestamp:

May 31, 2010, 5:45:02 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

e1086bd

Parents:

f52f909

git-author:

Alex Dehnert <adehnert@…> (05/31/10 05:45:02)

git-committer:

Alex Dehnert <adehnert@…> (05/31/10 05:45:02)

Message:

Allow filtering by approval_status (Trac: #8)

Location:

remit

Files:

• remit_templates/vouchers/reimbursementrequest_list.html (modified) (1 diff)
• vouchers/views.py (modified) (2 diffs)

remit/remit_templates/vouchers/reimbursementrequest_list.html

@@ -15 +15 @@
 <form>
 <table class='pretty-table'>
+<tr>
+    <th>Approval Status</th>
+    <td><select name='approval_status'>
+    <option value='all'{%ifequal approval_status "all"%} selected='selected'{%endifequal%}>All</option>
+    {% for id,label in approval_states %}
+    <option value='{{id}}'{%ifequal approval_status id%} selected='selected'{%endifequal%}>{{label}}</option>
+    {% endfor %}
+    </select></td>
+</tr>
 <tr>
     <th>Order</th>

remit/vouchers/views.py

@@ -377 +377 @@
         order = 'default'
 
+    if 'approval_status' in request.REQUEST:
+        approval_status = request.REQUEST['approval_status']
+    else:
+        approval_status = vouchers.models.APPROVAL_STATE_PENDING
+    if approval_status == 'all':
+        pass
+    else:
+        try:
+            approval_status = int(approval_status)
+        except ValueError:
+            raise Http404('approval_status poorly formatted')
+        state_row = [row for row in vouchers.models.APPROVAL_STATES if row[0] == approval_status]
+        if state_row:
+            qs = qs.filter(approval_status=approval_status)
+        else:
+            raise Http404('approval_status not known')
 
     return list_detail.object_list(
@@ -385 +401 @@
             'order'   : order,
             'orders'  : request_list_orders,
+            'approval_status' : approval_status,
+            'approval_states':  vouchers.models.APPROVAL_STATES,
             'pagename': 'list_requests',
         },