[Erp5-report] r35961 fabien - in /experimental/bt5/erp5_credential: SkinTemplateItem/portal...

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Jun  3 16:40:42 2010
New Revision: 35961

URL: http://svn.erp5.org?rev=35961&view=rev
Log:
if a user don't have corresponding person, show a nice error message instead of a site error.

Modified:
    experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newCredentialUpdate.xml
    experimental/bt5/erp5_credential/WorkflowTemplateItem/portal_workflow/credential_interaction_workflow/scripts/Credential_updatePersonProperties.xml
    experimental/bt5/erp5_credential/bt/revision

Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newCredentialUpdate.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newCredentialUpdate.xml?rev=35961&r1=35960&r2=35961&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newCredentialUpdate.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newCredentialUpdate.xml [utf8] Thu Jun  3 16:40:42 2010
@@ -53,7 +53,12 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string># create the credential update\n
+            <value> <string>person = context.ERP5Site_getAuthenticatedMemberPersonValue()\n
+if person is None:\n
+  portal_status_message = context.Base_translateString("Can\'t find corresponding person, it\'s not possible to update your credentials.")\n
+  return context.Base_redirect(\'\', keep_items = dict(portal_status_message=portal_status_message ))\n
+\n
+# create the credential update\n
 module = context.getDefaultModule(portal_type=\'Credential Update\')\n
 credential_update = module.newContent(\n
 \t\tportal_type="Credential Update")\n
@@ -66,14 +71,11 @@
                 default_credential_question_answer=default_credential_question_answer,\n
                 default_email_text=default_email_text)\n
 \n
-person = context.ERP5Site_getAuthenticatedMemberPersonValue()\n
-if person is not None:\n
-  credential_update.setDestinationDecisionValue(person)\n
-\n
+credential_update.setDestinationDecisionValue(person)\n
 credential_update.submit()\n
 \n
 portal_status_message = context.Base_translateString("Credential Update Created.")\n
-context.Base_redirect(\'\', keep_items = dict(portal_status_message=portal_status_message ))\n
+return context.Base_redirect(\'\', keep_items = dict(portal_status_message=portal_status_message ))\n
 </string> </value>
         </item>
         <item>
@@ -129,12 +131,12 @@
                             <string>kw</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>module</string>
-                            <string>credential_update</string>
                             <string>person</string>
                             <string>None</string>
                             <string>portal_status_message</string>
                             <string>dict</string>
+                            <string>module</string>
+                            <string>credential_update</string>
                           </tuple>
                         </value>
                     </item>

Modified: experimental/bt5/erp5_credential/WorkflowTemplateItem/portal_workflow/credential_interaction_workflow/scripts/Credential_updatePersonProperties.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/WorkflowTemplateItem/portal_workflow/credential_interaction_workflow/scripts/Credential_updatePersonProperties.xml?rev=35961&r1=35960&r2=35961&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/WorkflowTemplateItem/portal_workflow/credential_interaction_workflow/scripts/Credential_updatePersonProperties.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/WorkflowTemplateItem/portal_workflow/credential_interaction_workflow/scripts/Credential_updatePersonProperties.xml [utf8] Thu Jun  3 16:40:42 2010
@@ -56,6 +56,9 @@
             <value> <string>portal = state_change.getPortal()\n
 credential_update = state_change[\'object\']\n
 related_person = credential_update.getDestinationDecisionValue()\n
+if related_person is None:\n
+  return context.Base_redirect(\'view\', keep_items=dict(portal_status_message=\n
+      context.Base_translateString("Can\'t find corresponding person, it\'s not possible to update your credentials.")))\n
 \n
 person_kw = { \'first_name\':credential_update.getFirstName(),\n
               \'last_name\':credential_update.getLastName(),\n
@@ -64,9 +67,7 @@
               \'default_credential_question_question_free_text\':credential_update.getDefaultCredentialQuestionQuestionFreeText(),\n
               \'default_credential_question_question\':credential_update.getDefaultCredentialQuestionQuestion(),\n
             }\n
-context.log(related_person.getFirstName())\n
 related_person.edit(**person_kw)\n
-context.log(related_person.getFirstName())\n
 \n
 if credential_update.getPassword():\n
   related_person.setEncodedPassword(credential_update.getPassword())\n
@@ -123,10 +124,11 @@
                             <string>_getitem_</string>
                             <string>credential_update</string>
                             <string>related_person</string>
+                            <string>None</string>
+                            <string>context</string>
+                            <string>dict</string>
                             <string>person_kw</string>
-                            <string>context</string>
                             <string>_apply_</string>
-                            <string>dict</string>
                           </tuple>
                         </value>
                     </item>

Modified: experimental/bt5/erp5_credential/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/bt/revision?rev=35961&r1=35960&r2=35961&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_credential/bt/revision [utf8] Thu Jun  3 16:40:42 2010
@@ -1,1 +1,1 @@
-80
+81