Changeset 535 for WAeUP_SRP/trunk/skins/waeup_custom

Timestamp:

19 Sep 2006, 07:53:21 (18 years ago)

Author:

joachim

Message:

student apply admission should work now
the default_view for campus is now home_index.py
for students and student student_index.py
these script redirect to the appropriate PT

Location:

WAeUP_SRP/trunk/skins/waeup_custom

Files:

• logged_in.py (modified) (4 diffs)
• standard_error_message.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -13 +13 @@
 $Id: logged_in.py 34693 2006-03-23 17:44:22Z ogrisel $
 """
+import DateTime
+current = DateTime.DateTime()
 
 from urllib import unquote
@@ -26 +28 @@
     return to_member_home, to_workspaces
 
+request = context.REQUEST
+response = request.RESPONSE
 utool = context.portal_url
 mtool = context.portal_membership
@@ -43 +47 @@
     if not is_anon:
         if "Student" in member.getRoles():
-            member_id = str(member)
-            student = getattr(context.campus.students,member_id,)
-            if context.portal_workflow.getInfoFor(student,
-                                               'review_state',
-                                               None) == "created":
+            to_waeup_student_home = True
+            info = context.getStudentInfo()
+            student = info['student']
+##            member_id = str(member)
+##            student = getattr(context.campus.students,member_id,)
+##            if context.portal_workflow.getInfoFor(student,
+##                                               'review_state',
+##                                               None) == "created":
+            if info['review_state'] == "created":
                 student.content_status_modify(workflow_action="enter_application_pin")
                 da = {}
@@ -53 +61 @@
                 da['app_ac_pin'] = pin
                 da['app_ac_date'] = current
-                application.getContent().edit(mapping = da)
-                to_waeup_student_home = True
+                info['app_doc'].edit(mapping = da)
         elif "Manager" in member.getRoles():
             pass

WAeUP_SRP/trunk/skins/waeup_custom/standard_error_message.pt

@@ -15 +15 @@
 <tal:haserror condition="error_type">
   <tal:NotFound condition="python:error_type == 'NotFound'">
-    <metal:block use-macro="here/not_found/macros/not_found" />
+    <metal:block use-macro="here/error_not_found/macros/not_found" />
   </tal:NotFound>
 
-  <tal:default condition="python:0 and error_type != 'NotFound'">
-    <metal:block use-macro="here/error_lib_other/macros/other" />
+  <tal:default condition="python:error_type != 'NotFound'">
+    <metal:block use-macro="here/error_other/macros/other" />
   </tal:default>
 
-  <tal:debugging condition="python:0 and checkPerm('Manage portal', here)">
+  <tal:debugging condition="python:checkPerm('Manage portal', here)">
     <table width="100%" cellpadding="2" cellspacing="2">
       <tr>