Changeset 56c7337

Timestamp:

Jul 7, 2014, 10:07:17 PM (10 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

638b547

Parents:

80d8926

git-author:

Alex Dehnert <adehnert@…> (07/07/14 22:07:17)

git-committer:

Alex Dehnert <adehnert@…> (07/07/14 22:07:17)

Message:

Show error when a request can't be approved

This reduces confusion when a request gets approved twice (by different users,
or accidentally opening a tab twice).

Location:

remit

Files:

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

remit/remit_templates/vouchers/ReimbursementRequest_review.html

@@ -120 +120 @@
 {% endif %}
 
+
+{% if approve_error %}
+<div class='messagebox errorbox'>
+<h3>Approval Error</h3>
+<p>{{approve_error}}</p>
+</div>
+{% endif %}
+
 {% if approve_form %}
 <h3>Approve this reimbursement request:</h3>

remit/vouchers/views.py

@@ -261 +261 @@
     show_approve = (http_request.user.has_perm('vouchers.can_approve')
         and request_obj.approval_status == vouchers.models.APPROVAL_STATE_PENDING)
+    post_approve = (http_request.method == 'POST' and 'approve' in http_request.REQUEST)
     if show_approve:
         # Voucherize form
@@ -272 +273 @@
 
         approve_message = ''
-        if http_request.method == 'POST' and 'approve' in http_request.REQUEST:
+        if post_approve:
             approve_form = VoucherizeForm(http_request.POST)
             if approve_form.is_valid():
@@ -293 +294 @@
         context['approve_form'] = approve_form
         context['approve_message'] = approve_message
+    elif post_approve:
+        context['approve_error'] = "You attempted to approve a reimbursement request that you could not approve. Most likely, either the voucher has already been approved, or you do not have adequate permissions."
     if show_email:
         context['email_options'] = email_options