Changeset 3859

Timestamp:

17 Jan 2009, 08:11:19 (16 years ago)

Author:

Henrik Bettermann

Message:

finalize last revision

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getMemberInfo.py (modified) (1 diff)
• retrieve_password.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py

@@ -82 +82 @@
     app_email = info['app_email'] = student.application.getContent().app_email
     per_email = info['per_email'] = student_record.email
-    if app_email:
+    if per_email:
+        info['email'] = per_email
+    elif app_email:
         info['email'] = app_email
     else:
-        info['email'] = per_email
+        info['email'] = ''
+
     info['message'] = complete_msg % info
     info['with_email'] = bool(info['email'])

WAeUP_SRP/trunk/skins/waeup_student/retrieve_password.py

@@ -14 +14 @@
 REQUEST = context.REQUEST
 
+short_msg="""
+From: %s <%s>
+To: %s
+Reply-To: %s
+Subject: %s
+Your SRP Member Details
+-----------------------
+
+Fullname: %s
+Student Id: %s
+Password: %s
+
+"""
 
 mtool = context.portal_membership
@@ -77 +90 @@
     probtype = 'Your Student Id and Password'
 
-    short_msg="""
-    From: %s <%s>
-    To: %s
-    Reply-To: %s
-    Subject: %s
-    Your SRP Member Details
-    -----------------------
-    
-    Fullname: %s
-    Student Id: %s
-    Password: %s
-    
-    """
+
     message = short_msg %(co_name,co_email,email,co_email,probtype,record.name,s_id,pw)
-    #mhost.send(message % d)
+    mhost.send(message)
 
-    return message
     return context.retrieve_password_form(rendered = res,
                              psm = "Notification has been sent!",