Changeset 1783 for WAeUP_SRP/trunk/skins/waeup_epayment

Timestamp:

15 May 2007, 07:49:50 (18 years ago)

Author:

Henrik Bettermann

Message:

• assertViewable removed and page templates adjusted, so that no traceback occurs.
• 'Previous Session' action added
• waeup_content_master.pt removed
• and more

Location:

WAeUP_SRP/trunk/skins/waeup_epayment

Files:

• getPaymentsFolderInfo.py (modified) (1 diff)
• payment_receipt.pt (modified) (1 diff)
• payments_view.pt (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -12 +12 @@
 Info for the PaymentsFolder
 """
+
+mtool = context.portal_membership
+if mtool.isAnonymousUser():
+    return None
+
+
 #import logging
 #logger = logging.getLogger('Skins.getPaymentsFolderInfo')

WAeUP_SRP/trunk/skins/waeup_epayment/payment_receipt.pt

@@ -3 +3 @@
                 tal:define="info context/getStudentBaseInfo;
                             info_doc context/getDocumentInfo">
-      <span tal:condition="not: info">
+      
+      <span tal:condition="python: not info or not info_doc">
         <span tal:content="here/illegal_view" />
       </span>
-      <span tal:condition="info">
+      
+      <span tal:condition="python: info and info_doc">
       
         <metal:block tal:condition="python:info_doc['doc'].resp_code in ('00','AP','IP')">            

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -1 @@
-<metal:body use-macro="here/waeup_content_master/macros/master">
-      <metal:block fill-slot="header"
-                   tal:define="is_student context/isStudent;
-                               s_name context/getStudentNameInContext;">
+<metal:body use-macro="here/main_template/macros/master">
+      <metal:main fill-slot="main"
+                  tal:define="info context/getPaymentsFolderInfo;">
+
+        <span tal:condition="not: info">
+          <span tal:content="here/illegal_view" />
+        </span>
+        <span tal:condition="info">
+        <span tal:define= " rows info/payments;
+                            review_state context/getStudentReviewState;
+                            is_student context/isStudent;
+                            s_name context/getStudentNameInContext;">
         <a href=""
            tal:attributes="href string:${context/aq_parent/absolute_url}">
@@ -18 +26 @@
         </h3>
         <br />
-      </metal:block>
-      <metal:main fill-slot="main"
-                  tal:define="info context/getPaymentsFolderInfo;
-                              rows info/payments;
-                              review_state context/getStudentReviewState">
+
 
         <table class="registration" width="100%">
@@ -62 +66 @@
                 />
                 
-
-
                 
         </form>  
@@ -79 +81 @@
                 />
         </form>          
-        
-        
         </div>        
+
+      </span>
+      </span>
       </metal:main>
 </metal:body>