Changeset 922e0e5

Timestamp:

Jul 7, 2014, 11:41:56 PM (10 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

feed77c

Parents:

638b547

git-author:

Alex Dehnert <adehnert@…> (07/07/14 23:41:56)

git-committer:

Alex Dehnert <adehnert@…> (07/07/14 23:41:56)

Message:

Rename the approval actions

Location:

remit

Files:

• settings/__init__.py (modified) (1 diff)
• vouchers/models.py (modified) (4 diffs)

remit/settings/__init__.py

@@ -19 +19 @@
 GROUP_NAME = 'Remit'
 GROUP_ABBR = 'RM'
-SIGNATORY_EMAIL = None
+SIGNATORY_EMAIL = None # used only for paper vouchers (which SAO killed)
 
 CC_SUBMITTER = False

remit/vouchers/models.py

@@ -135 +135 @@
         )
 
-    def approve(self, approver, signatory_name, signatory_email=None, ):
+    def approve_as_voucher(self, approver, signatory_name, signatory_email=None, ):
         """Mark a request as approved.
 
@@ -354 +354 @@
         return [ action for action in actions if action.can(user) ]
 
-def bulk_action_approve(http_request, rr):
+def bulk_action_approve_as_voucher(http_request, rr):
     approver = http_request.user
     signatory_name = http_request.user.get_full_name()
@@ -360 +360 @@
         return False, "already approved"
     else:
-        rr.approve(approver, signatory_name)
+        rr.approve_as_voucher(approver, signatory_name)
         return True, "request approved"
 
@@ -385 +385 @@
 if settings.SIGNATORY_EMAIL:
     bulk_request_actions.append(BulkRequestAction(
-        name='approve',
-        label='Approve Requests',
-        action=bulk_action_approve,
+        name='approve_as_voucher',
+        label='Approve requests (for vouchers)',
+        action=bulk_action_approve_as_voucher,
         perm_predicate=perm_checker('vouchers.can_approve'),
     ))
 bulk_request_actions.append(BulkRequestAction(
     name='approve_as_rfp',
-    label='Mark Requests as RFPized',
+    label='Approve requests (for RFPizing)',
     action=bulk_action_approve_as_rfp,
     perm_predicate=perm_checker('vouchers.can_approve'),