Changeset 9169 for main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/applicants/viewlets.py

Timestamp:

10 Sep 2012, 11:05:07 (12 years ago)

Author:

uli

Message:

Merge changes from trunk, r8786-HEAD

Location:

main/waeup.kofa/branches/uli-async-update

Files:

• . (modified) (1 prop)
• src/waeup/kofa/applicants/viewlets.py (modified) (3 diffs)

main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/applicants/viewlets.py

@@ -183 +183 @@
         """Get a URL to the target...
         """
-        if self.context.state in ('initialized', 'started'):
+        if self.context.state in ('initialized', 'started', 'paid'):
             return
         return self.view.url(self.view.context, self.target)
@@ -204 +204 @@
 
 class PaymentReceiptActionButton(ManageActionButton):
-    grok.order(1)
+    grok.order(9) # This button should always be the last one.
     grok.context(IApplicantOnlinePayment)
     grok.view(OnlinePaymentDisplayFormPage)
@@ -219 +219 @@
 
 class ApprovePaymentActionButton(ManageActionButton):
-    grok.order(2)
+    grok.order(8)
     grok.context(IApplicantOnlinePayment)
     grok.view(OnlinePaymentDisplayFormPage)