Changeset 3e79308 for remit

Timestamp:

Feb 4, 2010, 3:45:14 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

3a0c51b

Parents:

bf5333c

git-author:

Alex Dehnert <adehnert@…> (02/04/10 03:45:14)

git-committer:

Alex Dehnert <adehnert@…> (02/04/10 03:45:14)

Message:

Don't let you approve a non-pending request

Location:

remit

Files:

• remit_templates/vouchers/ReimbursementRequest_review.html (modified) (2 diffs)
• vouchers/models.py (modified) (1 diff)
• vouchers/views.py (modified) (3 diffs)

remit/remit_templates/vouchers/ReimbursementRequest_review.html

@@ -61 +61 @@
 {% if approve_message %}
 <p>{{ approve_message }}</p>
-{% endif %}
+{% else %}
 <form method="post" action="">
 <table class='pretty-table'>
@@ -72 +72 @@
 </form>
 {% endif %}
+{% endif %}
 
 {% endblock %}

remit/vouchers/models.py

@@ -5 +5 @@
 import datetime
 
+APPROVAL_STATE_PENDING = 0
+APPROVAL_STATE_APPROVED = 1
+APPROVAL_STATE_REJECTED = -1
 APPROVAL_STATES = (
-    ( 0, 'Pending'),
-    ( 1, 'Approved'),
-    (-1, 'Rejected'),
+    (APPROVAL_STATE_PENDING,  'Pending'),
+    (APPROVAL_STATE_APPROVED, 'Approved'),
+    (APPROVAL_STATE_REJECTED, 'Rejected'),
 )
 

remit/vouchers/views.py

@@ -1 +1 @@
 import vouchers.models
+from vouchers.models import ReimbursementRequest
 from finance_core.models import BudgetTerm, BudgetArea
-from vouchers.models import ReimbursementRequest
 
 from django.contrib.auth.decorators import user_passes_test
@@ -139 +139 @@
     request_obj = get_object_or_404(ReimbursementRequest, pk=object_id)
 
-    if http_request.user.has_perm('vouchers.can_approve'):
+    show_approve = (http_request.user.has_perm('vouchers.can_approve')
+        and request_obj.approval_status == vouchers.models.APPROVAL_STATE_PENDING)
+    if show_approve:
         # Voucherize form
         # Prefill from certs / config
@@ -178 +180 @@
         'rr':request_obj,
     }
-    if http_request.user.has_perm('vouchers.can_approve'):
+    if show_approve:
         context['approve_form'] = approve_form
         context['approve_message'] = approve_message