From 3f1ffdb8f4f44c71541c5368e6866981ae490195 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Fri, 17 May 2013 11:30:10 +0200
Subject: [PATCH] work in progress: info texts and feedback pages for
 self-service registration

---
 browser/common.py               |   2 +-
 locales/de/LC_MESSAGES/loops.mo | Bin 23981 -> 24159 bytes
 locales/de/LC_MESSAGES/loops.po |   2 +-
 organize/README.txt             |   2 +-
 organize/browser/member.py      |  72 +++++++++++++++++++++++++-------
 organize/browser/view_macros.pt |   7 ++++
 6 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/browser/common.py b/browser/common.py
index 8639958..d8886e3 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -481,7 +481,7 @@ class BaseView(GenericView, I18NView):
             return absoluteURL(provider, self.request)
         return None
 
-    def renderText(self, text, contentType):
+    def renderText(self, text, contentType='text/restructured'):
         text = util.toUnicode(text)
         typeKey = util.renderingFactories.get(contentType, None)
         if typeKey is None:
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index b0317196556620a3f9a8c56118766a5291aa3c4c..ad3d32055612f5c99ce41d9468b0b9cced058617 100644
GIT binary patch
delta 7346
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
UTTtlt?ceAtYP~ID%=()D1F?2ma{vGU

delta 7169
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

diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index 3d0a6bb..1a93a8d 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/locales/de/LC_MESSAGES/loops.po
@@ -774,7 +774,7 @@ msgstr "Die Passwort-Wiederholung stimmt nicht mit dem eingegebenen Passwort üb
 msgid "confirmation_mail_subject"
 msgstr "Benutzer-Registrierung"
 
-msgid "confirmation_mail_text."
+msgid "confirmation_mail_text"
 msgstr "Bitte clicken Sie auf den folgenden Link, um die Anmeldung abzschließen."
 
 msgid "The user account has been created."
diff --git a/organize/README.txt b/organize/README.txt
index e013d9f..110efe6 100644
--- a/organize/README.txt
+++ b/organize/README.txt
@@ -185,7 +185,7 @@ sure that a principal object can be served by a corresponding factory):
   ...         'lastName': u'Sawyer',
   ...         'firstName': u'Tom',
   ...         'email': u'tommy@sawyer.com',
-  ...         'action': 'update',}
+  ...         'form.action': 'update',}
 
 and register it.
 
diff --git a/organize/browser/member.py b/organize/browser/member.py
index 502c71f..28e13f0 100644
--- a/organize/browser/member.py
+++ b/organize/browser/member.py
@@ -83,6 +83,7 @@ class BaseMemberRegistration(NodeView):
 
     interface = IMemberRegistration     # TODO: add company, create institution
     message = _(u'The user account has been created.')
+    template = form_macros
 
     formErrors = dict(
         confirm_nomatch=FormError(_(u'Password and password confirmation do not match.')),
@@ -95,6 +96,17 @@ class BaseMemberRegistration(NodeView):
     permissions_key = u'registration.permissions'
     roles_key = u'registration.roles'
     registration_adapter_key = u'registration.adapter'
+    text_names_prefix = 'organize.member.registration'
+    # texts: reg_info, reg_feedback, conf_mail, conf_info, conf_feedback
+    info_key = 'reg_info'
+    feedback_key = 'reg_feedback'
+
+    isInnerHtml = False
+    showAssignments = False
+    form_action = 'register'
+
+    def closeAction(self, submit=True):
+        return u''
 
     @Lazy
     def macro(self):
@@ -118,6 +130,21 @@ class BaseMemberRegistration(NodeView):
     def getPrincipalAnnotation(self, principal):
         return annotations(principal).get(ANNOTATION_KEY, None)
 
+    @Lazy
+    def infoText(self):
+        name = '.'.join((self.text_names_prefix, self.info_key))
+        text = self.resourceManager.get(name)
+        if text:
+            return self.renderText(text.data)
+        return u''
+
+    @Lazy
+    def feedbackUrl(self):
+        name = '.'.join((self.text_names_prefix, self.feedback_key))
+        text = self.resourceManager.get(name)
+        if text:
+            return self.getUrlForTarget(text)
+
 
 class MemberRegistration(BaseMemberRegistration, CreateForm):
 
@@ -135,7 +162,7 @@ class MemberRegistration(BaseMemberRegistration, CreateForm):
 
     def update(self):
         form = self.request.form
-        if not form.get('action'):
+        if not form.get('form.action'):
             return True
         instance = component.getAdapter(self.object, IInstance, name='editor')
         instance.template = self.schema
@@ -186,13 +213,17 @@ class SecureMemberRegistration(BaseMemberRegistration, CreateForm):
         #schema.fields.reorder(-2, 'loginName')
         return schema
 
+    @Lazy
+    def macro(self):
+        return organize_macros.macros['register']
+
     @Lazy
     def object(self):
         return Person(Concept())
 
     def update(self):
         form = self.request.form
-        if not form.get('action'):
+        if not form.get('form.action'):
             return True
         instance = component.getAdapter(self.object, IInstance, name='editor')
         instance.template = self.schema
@@ -205,7 +236,7 @@ class SecureMemberRegistration(BaseMemberRegistration, CreateForm):
         regMan = IMemberRegistrationManager(self.context.getLoopsRoot())
         pw = generateName()
         email = form.get('email')
-        try:
+        try:    
             result = regMan.register(login, pw,
                                      form.get('lastName'), form.get('firstName'),
                                      email=email,)
@@ -221,8 +252,11 @@ class SecureMemberRegistration(BaseMemberRegistration, CreateForm):
         pa['id'] = generateName()
         pa['timestamp'] = datetime.utcnow()
         self.notifyEmail(login, email, pa['id'])
-        msg = self.message
-        self.request.response.redirect('%s?loops.message=%s' % (self.url, msg))
+        if self.feedbackUrl:
+            self.request.response.redirect(self.feedbackUrl)
+        else:
+            msg = self.message
+            self.request.response.redirect('%s?loops.message=%s' % (self.url, msg))
         return False
 
     def notifyEmail(self, userid, recipient, id):
@@ -230,11 +264,18 @@ class SecureMemberRegistration(BaseMemberRegistration, CreateForm):
         url = u'%s/selfservice_confirmation.html?login=%s&id=%s' % (
                                     baseUrl, userid, id,)
         recipients = [recipient]
-        message = _(u'confirmation_mail_text') + u':\n\n'
-        message = (message + url).encode('UTF-8')
+        subject = _(u'confirmation_mail_subject')
+        name = '.'.join((self.text_names_prefix, self.feedback_key))
+        text = self.resourceManager.get(name)
+        if text:
+            message = text.data % url
+            subject = text.description or subject
+        else:
+            message = _(u'confirmation_mail_text') + u':\n\n'
+            message = (message + url).encode('UTF-8')
         sender = 'helmutm@cy55.de'
         msg = MIMEText(message, 'plain', 'utf-8')
-        msg['Subject'] = _(u'confirmation_mail_subject')
+        msg['Subject'] = subject
         msg['From'] = sender
         msg['To'] = ', '.join(recipients)
         mailhost = component.getUtility(IMailDelivery, 'Mail')
@@ -245,15 +286,11 @@ class ConfirmMemberRegistration(BaseMemberRegistration, Form):
 
     permissions_key = u'secure_registration.permissions'
     roles_key = u'secure_registration.roles'
+    info_key = 'conf_info'
+    feedback_key = 'conf_feedback'
 
-    template = form_macros
-    isInnerHtml = False
-    showAssignments = False
     form_action = 'confirm_registration'
 
-    def closeAction(self, submit=True):
-        return u''
-
     @Lazy
     def macro(self):
         return organize_macros.macros['confirm']
@@ -306,8 +343,11 @@ class ConfirmMemberRegistration(BaseMemberRegistration, Form):
         del pa['timestamp']
         ip = getInternalPrincipal(userId)
         ip.setPassword(pw)
-        url = '%s?loops.message=%s' % (self.url, self.message)
-        self.request.response.redirect(url)
+        if self.feedbackUrl:
+            self.request.response.redirect(self.feedbackUrl)
+        else:
+            url = '%s?loops.message=%s' % (self.url, self.message)
+            self.request.response.redirect(url)
         return False
 
 
diff --git a/organize/browser/view_macros.pt b/organize/browser/view_macros.pt
index ecc21ad..bff4b91 100644
--- a/organize/browser/view_macros.pt
+++ b/organize/browser/view_macros.pt
@@ -1,7 +1,14 @@
 <html i18n:domain="loops">
 
 
+<metal:block define-macro="register">
+  <tal:info content="structure item/infoText" />
+  <metal:data use-macro="view/form_macros/edit" />
+</metal:block>
+
+
 <metal:block define-macro="confirm">
+  <tal:info content="structure item/infoText" />
   <metal:data use-macro="view/form_macros/edit">
     <metal:custom fill-slot="custom_header">
       <tbody><tr><td colspan="5">