Changeset 6e43384 for remit

Timestamp:

May 31, 2010, 4:47:29 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

f52f909

Parents:

213c1e0

git-author:

Alex Dehnert <adehnert@…> (05/31/10 04:47:29)

git-committer:

Alex Dehnert <adehnert@…> (05/31/10 04:47:29)

Message:

Let users view history of requests (Trac: #26)

Location:

remit

Files:

• remit_templates/base.html (modified) (1 diff)
• remit_templates/index.html (modified) (1 diff)
• remit_templates/vouchers/reimbursementrequest_list.html (modified) (1 diff)
• vouchers/urls.py (modified) (1 diff)
• vouchers/views.py (modified) (3 diffs)

remit/remit_templates/base.html

@@ -13 +13 @@
         <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url homepage %}">Home</a></li>
         <li{% ifequal pagename "request_reimbursement" %} class='selected'{% endifequal %}><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
-        {% if perms.vouchers.can_list %}
         <li{% ifequal pagename "list_requests" %} class='selected'{% endifequal %}><a href="{% url list_requests %}">List requests</a></li>
-        {% endif %}
         {% if perms.finance_core.use_reporting %}
         <li{% ifequal pagename "reporting" %} class='selected'{% endifequal %}><a href="{% url reporting %}">Reporting</a></li>

remit/remit_templates/index.html

@@ -15 +15 @@
     {% endif %}
     <li><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
-    {% if perms.vouchers.can_list %}
     <li><a href="{% url list_requests %}">List requests</a></li>
-    {% endif %}
     {% if perms.finance_core.use_reporting %}
     <li><a href="{% url reporting %}">Reporting</a></li>

remit/remit_templates/vouchers/reimbursementrequest_list.html

@@ -6 +6 @@
 
 <h2>List Reimbursement Requests</h2>
+
+{%if useronly%}
+<p>Displaying only vouchers related to you.</p>
+{%else%}
+<p>You have permission to list all vouchers.</p>
+{%endif%}
 
 <table class='pretty-table'>

remit/vouchers/urls.py

@@ -6 +6 @@
 
 urlpatterns = patterns('',
-    url(r'list/', permission_required('vouchers.can_list')(object_list),
-        kwargs={
-            'queryset': vouchers.models.ReimbursementRequest.objects.all(),
-            'extra_context':{'pagename':'list_requests'},
-        },
-        name='list_requests',
-    ),
+    url(r'list/', vouchers.views.show_requests, name='list_requests', ),
     url(r'reimbursement/', 'vouchers.views.select_request_basics', name='request_reimbursement', ),
     (r'submit/(?P<term>[\d\w-]+)/(?P<committee>[\d\w-]+)/', 'vouchers.views.submit_request', ),

remit/vouchers/views.py

@@ -4 +4 @@
 from util.shortcuts import get_403_response
 
-from django.contrib.auth.decorators import user_passes_test
+from django.contrib.auth.decorators import user_passes_test, login_required
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
@@ -14 +14 @@
 from django.core.urlresolvers import reverse
 from django.core.mail import send_mail, mail_admins
+from django.db.models import Q
 from django.template import Context, Template
 from django.template.loader import get_template
+from django.views.generic import list_detail
 
 import settings
@@ -338 +340 @@
 
     return response
+
+def get_related_requests_qobj(user, ):
+    return Q(submitter=user.username) | Q(check_to_email=user.email)
+
+@login_required
+def show_requests(request, ):
+    if request.user.has_perm('vouchers.can_list'):
+        qs = ReimbursementRequest.objects.all()
+        useronly = False
+    else:
+        qs = ReimbursementRequest.objects.filter(get_related_requests_qobj(request.user))
+        useronly = True
+
+    return list_detail.object_list(
+        request,
+        queryset=qs,
+        extra_context={
+            'useronly': useronly,
+            'pagename': 'list_requests',
+        },
+    )