Changeset 1340 for WAeUP_SRP/trunk

Timestamp:

21 Jan 2007, 23:20:00 (18 years ago)

Author:

Henrik Bettermann

Message:

make transfer work

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actions.xml (modified) (1 diff)
• skins/waeup_student/request_transfer.py (modified) (4 diffs)
• skins/waeup_student/request_transfer_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -44 +44 @@
      visible="True"/>
   <action title="Request Transfer" action_id="request_transfer" category="student"
-     condition_expr="python: here.getStudentWorkflowInfo()['cr']" url_expr="string:${portal_url}/request_transfer"
-     visible="True"/>     
+     condition_expr="python: member and here.getStudentWorkflowInfo()['cr']" url_expr="string:${portal_url}/request_transfer"
+     visible="True"/>
  </action-provider>
  <action-provider name="portal_actions">

WAeUP_SRP/trunk/skins/waeup_student/request_transfer.py

@@ -14 +14 @@
 import logging
 from urllib import urlencode
-logger = logging.getLogger('EPayment.')
+logger = logging.getLogger('Student.Transfer.Request')
 import DateTime
 lt = context.portal_layouts
@@ -20 +20 @@
 students = context.portal_url.getPortalObject().campus.students
 
-student_id = context.getStudentId()
+mtool = context.portal_membership
+member = mtool.getAuthenticatedMember()
+member_id = str(member)
+requested_id = context.getStudentId()
+if requested_id and not context.isStaff() and member_id != requested_id:
+    logger.info('"%s", "accessed application object of", "%s"' % (member_id,requested_id))
+    student_id = requested_id
+elif context.isStaff():
+    student_id = requested_id
+else:
+    student_id = member_id
 if student_id is None:
     return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
@@ -27 +37 @@
 sbrain = context.students_catalog(id=student_id)[0]
 payments = getattr(student,'payments').objectIds()
-payed = False
+paid = False
 for payment in payments:
     if payment.startswith('transfer'):
-        payed = True
+        paid = True
         break
 
 # for testing of transfer forms
-#payed = True
+#paid = True
 
-if payed:
+if paid:
+    logger.info('"%s", "opened (paid) request transfer form of", "%s"' % (member_id,student_id))
     return context.request_transfer_form(rendered = None,
                                  psm = None,
-                                 payed = True,
+                                 paid = True,
                                  )
 
@@ -94 +105 @@
 return context.request_transfer_form(rendered = None,
                                  psm = None,
-                                 payed = True,
+                                 paid = True,
                                  )
 

WAeUP_SRP/trunk/skins/waeup_student/request_transfer_form.pt

@@ -1 +1 @@
 <metal:block use-macro="here/waeup_content_master/macros/master">
+    <metal:main fill-slot="header" />
     <metal:main fill-slot="main"
                     tal:define="rendered_main options/rendered;