Changeset 8629 for main/waeup.kofa/trunk/src/waeup

Timestamp:

5 Jun 2012, 14:25:40 (13 years ago)

Author:

Henrik Bettermann

Message:

In some custom packages we need to display login credentials on landing pages after registration. Make provisions in base package for that.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• browser.py (modified) (3 diffs)
• browser_templates/applicantregemailsent.pt (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -1003 +1003 @@
         return
 
+    def _redirect(self, email, password, applicant_id):
+        # Forward only email to landing page in base package.
+        self.redirect(self.url(self.context, 'registration_complete',
+            data = dict(email=email)))
+        return
+
     @action(_('Get login credentials'), style='primary')
     def register(self, **data):
@@ -1057 +1063 @@
         if kofa_utils.sendCredentials(IUserAccount(applicant),
             password, login_url, msg):
-            self.redirect(self.url(self.context, 'registration_complete',
-                                   data = dict(email=applicant.email)))
-            return
+            email_sent = applicant.email
         else:
-            self.flash(_('Email could not been sent. Please retry later.'))
+            email_sent = None
+        self._redirect(email=email_sent, password=password,
+            applicant_id=applicant.applicant_id)
         return
 
 class ApplicantRegistrationEmailSent(KofaPage):
     """Landing page after successful registration.
+
     """
     grok.name('registration_complete')
@@ -1072 +1079 @@
     label = _('Your registration was successful.')
 
-    def update(self, email=None):
+    def update(self, email=None, applicant_id=None, password=None):
         self.email = email
-        return
+        self.password = password
+        self.applicant_id = applicant_id
+        return

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantregemailsent.pt

@@ -1 @@
-<div i18n:domain="waeup.kofa">
-  <p>
+<tal:only_email condition = "not: view/password" i18n:domain="waeup.kofa">
+  <p tal:condition = "view/email">
     <span i18n:translate=""> An email with your user name and password
     has been sent to
@@ -6 +6 @@
     <span tal:replace="view/email">user@foo.baz</span>.
   </p>
-  <p i18n:translate="">
+  <p tal:condition = "view/email" i18n:translate="">
     Please check your email account to proceed.
+  </p>
+  <p tal:condition = "not: view/email" i18n:translate="">
+    Email could not been sent. Please retry later.
   </p>
   <p  i18n:translate="">
     Thanks for using Kofa!
   </p>
-</div>
+</tal:only_email>
+
+<tal:credentials condition = "view/password" i18n:domain="waeup.kofa">
+  <h3 i18n:translate="">Your login credentials are:</h3>
+  <table class="bordered-table span6">
+    <tr>
+      <td i18n:translate="">User Name:</td>
+      <td tal:content="view/applicant_id">ID</td>
+    <tr>
+    <tr>
+      <td i18n:translate="">Password:</td>
+      <td tal:content="view/password">PASSWORD</td>
+    <tr>
+  </table>
+  <p i18n:translate="">
+    Print this page and proceed to the
+    <a tal:attributes="href python: view.url(layout.site, 'login')">login form</a>.
+    Please note that passwords are case-sensitive,
+    <br />when entering your credentials, and keep your password secret!
+  </p>
+  <p tal:condition = "view/email">
+    <span i18n:translate=""> An email with your user name and password
+    has been sent to
+    </span>
+    <span tal:replace="view/email">user@foo.baz</span>.
+  </p>
+  <p  i18n:translate="">
+    Thanks for using Kofa!
+  </p>
+</tal:credentials>