Changeset bef7191 for remit/vouchers/views.py

Timestamp:

Jul 24, 2010, 9:19:56 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

dd6edfb

Parents:

b1a259c

git-author:

Alex Dehnert <adehnert@…> (07/24/10 21:19:56)

git-committer:

Alex Dehnert <adehnert@…> (07/24/10 21:19:56)

Message:

Rename request to http_request in show_requests

vouchers.views.show_requests has this awkward ambiguity between
request=http_request and request=ReimbursementRequest?. By renaming
request to http_request, this ambiguity can be reduced.

File:

• remit/vouchers/views.py (modified) (3 diffs)

remit/vouchers/views.py

@@ -355 +355 @@
 
 @login_required
-def show_requests(request, ):
+def show_requests(http_request, ):
     # PERMISSION-BASED REQUEST FILTERING
-    if request.user.has_perm('vouchers.can_list'):
+    if http_request.user.has_perm('vouchers.can_list'):
         qs = ReimbursementRequest.objects.all()
         useronly = False
     else:
-        qs = ReimbursementRequest.objects.filter(get_related_requests_qobj(request.user))
+        qs = ReimbursementRequest.objects.filter(get_related_requests_qobj(http_request.user))
         useronly = True
 
     # SORTING
-    if 'order' in request.REQUEST:
-        order_row = [row for row in request_list_orders if row[0] == request.REQUEST['order']]
+    if 'order' in http_request.REQUEST:
+        order_row = [row for row in request_list_orders if row[0] == http_request.REQUEST['order']]
         if order_row:
             order, label, cols = order_row[0]
@@ -376 +376 @@
 
     # DISCRETIONARY REQUEST FILTERING
-    if 'approval_status' in request.REQUEST:
-        approval_status = request.REQUEST['approval_status']
+    if 'approval_status' in http_request.REQUEST:
+        approval_status = http_request.REQUEST['approval_status']
     else:
         approval_status = vouchers.models.APPROVAL_STATE_PENDING
@@ -395 +395 @@
     # GENERATE THE REQUEST
     return list_detail.object_list(
-        request,
+        http_request,
         queryset=qs,
         extra_context={