Changeset 1281

Timestamp:

12 Jan 2007, 09:49:31 (18 years ago)

Author:

Henrik Bettermann

Message:

mail_password_form now works for all students

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getMemberInfo.py (modified) (2 diffs)
• mail_password_form.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py

@@ -38 +38 @@
 students_object = context.portal_url.getPortalObject().campus.students
 student = getattr(students_object, student_id)
-info['student'] = student
-info['id'] = student_id
-info['review_state'] = wf.getInfoFor(student,'review_state',None)
-info['per'] = student.personal
-info['app'] = student.application
-info['per_doc'] = student.personal.getContent()
-info['app_doc'] = student.application.getContent()
-info['clear_doc'] = student.clearance.getContent()
-info['password'] = context.waeup_tool.getCredential(student_id)
 
-if info['per_doc'].email:
-    info['email'] = info['per_doc'].email
-else:
-    info['email'] = info['app_doc'].app_email
+if hasattr(student,"application"):
 
-msg="""
+    info['student'] = student
+    info['id'] = student_id
+    info['review_state'] = wf.getInfoFor(student,'review_state',None)
+    info['per'] = student.personal
+    info['app'] = student.application
+    info['per_doc'] = student.personal.getContent()
+    info['app_doc'] = student.application.getContent()
+    info['clear_doc'] = student.clearance.getContent()
+    info['password'] = context.waeup_tool.getCredential(student_id)
+
+    if info['per_doc'].email:
+        info['email'] = info['per_doc'].email
+    else:
+        info['email'] = info['app_doc'].app_email
+
+    msg="""
 Your SRP Member Details
 -----------------------
@@ -68 +71 @@
 """
 
-info['message'] = msg % (
-    student.Title(),
-    student_id,
-    info['clear_doc'].matric_no,
-    info['app_doc'].jamb_reg_no,
-    info['app_doc'].app_email,
-    info['per_doc'].email,
-    info['clear_doc'].birthday,
-    info['password']
-    )
+    info['message'] = msg % (
+        student.Title(),
+        student_id,
+        info['clear_doc'].matric_no,
+        info['app_doc'].jamb_reg_no,
+        info['app_doc'].app_email,
+        info['per_doc'].email,
+        info['clear_doc'].birthday,
+        info['password']
+        )
+else:
+        
+    info['student'] = student
+    info['id'] = student_id
+    info['review_state'] = wf.getInfoFor(student,'review_state',None)
+    info['password'] = context.waeup_tool.getCredential(student_id)
+    info['email'] = 'na'
+
+    msg="""
+Your SRP Member Details
+-----------------------
+
+Fullname: %s
+Student Id: %s
+Password: %s
+
+"""
+
+    info['message'] = msg % (
+        'na',
+        student_id,
+        info['password']
+        )
+        
+        
+        
+                    
 
 return info

WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt

@@ -30 +30 @@
           </td>
           <td>
-             <span tal:content="info/student/Title" />
+             <span tal:condition="info/student/Title" tal:content="info/student/Title" />
+             <span tal:condition="not:info/student/Title">na</span>
           </td>
         </tr>
@@ -62 +63 @@
           </td>
         </tr>
-        <tr>
+        <tr tal:condition="python: info['email']!='na'">
           <td>&nbsp;</td>
           <td><input name="Submit" type="submit" class="standalone" value="Submit" /><br /><br /></td>