Changeset 7222

Timestamp:

27 Nov 2011, 07:48:48 (13 years ago)

Author:

Henrik Bettermann

Message:

Make email address required field of user accounts.

Use user's email adress in contactadminform.pt

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/browser.txt (modified) (2 diffs)
• browser/pages.py (modified) (1 diff)
• browser/templates/contactadminform.pt (modified) (1 diff)
• interfaces.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt

@@ -127 +127 @@
   >>> browser.getControl(name="password").value = 'secret'
   >>> browser.getControl(name="control_password").value = 'secret'
+  >>> browser.getControl(name="form.email").value = 'xx@yy.zz'
   >>> browser.getControl("Add user").click()
   >>> print browser.contents
@@ -160 +161 @@
   >>> browser.getControl(name="password").value = 'secret'
   >>> browser.getControl(name="control_password").value = 'secret'
+  >>> browser.getControl(name="form.email").value = 'xx@yy.zz'
   >>> browser.getControl("Add user").click()
   >>> 'The userid chosen already exists' in browser.contents

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -477 +477 @@
 
     @property
+    def get_user_account(self):
+        return get_user_account(self.request)
+
+    @property
     def namefield_label(self):
         if self.request.principal.title == 'Applicant':

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactadminform.pt

@@ -23 +23 @@
      <strong>Email: </strong>
   </td>
-  <td>
+  <td tal:condition="not:view/get_user_account">
      <input name="email" type="text" id="email" />
+  </td>
+  <td tal:condition="view/get_user_account">
+    <span tal:content="view/get_user_account/email" />
+    <input type="hidden" name="fullname" type="text" id="fullname"
+       tal:attributes="value view/get_user_account/email"/>
   </td>
 </tr>

main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

@@ -222 +222 @@
         title = u'Email',
         default = None,
-        required = False,
+        required = True,
         constraint=validate_email,
         )