[Erp5-report] r24234 - in /erp5/trunk/bt5/erp5_deferred_style: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: romain
Date: Fri Oct 17 17:53:35 2008
New Revision: 24234

URL: http://svn.erp5.org?rev=24234&view=rev
Log:
Prevent error when recipient does not have a email address

Modified:
    erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml
    erp5/trunk/bt5/erp5_deferred_style/bt/revision

Modified: erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml?rev=24234&r1=24233&r2=24234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml (original)
+++ erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml Fri Oct 17 17:53:35 2008
@@ -58,6 +58,19 @@
 \n
 portal = context.getPortalObject()\n
 N_ = portal.Base_translateString\n
+\n
+try:\n
+  person_value = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
+except ValueError:\n
+  portal.changeSkin(None)\n
+  return context.Base_redirect(\'view\', keep_items=dict(\n
+              portal_status_message=N_("You didn\'t defined your email address")))\n
+\n
+if person_value.getDefaultEmailText(\'\') == \'\':\n
+  portal.changeSkin(None)\n
+  return context.Base_redirect(\'view\', keep_items=dict(\n
+              portal_status_message=N_("You didn\'t defined your email address")))\n
+  \n
 active_process = portal.portal_activities.newActiveProcess()\n
 user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n
 \n
@@ -164,6 +177,10 @@
                             <string>context</string>
                             <string>portal</string>
                             <string>N_</string>
+                            <string>person_value</string>
+                            <string>ValueError</string>
+                            <string>None</string>
+                            <string>dict</string>
                             <string>active_process</string>
                             <string>user_name</string>
                             <string>skin_name</string>
@@ -171,7 +188,6 @@
                             <string>tag</string>
                             <string>priority</string>
                             <string>report_section_list</string>
-                            <string>dict</string>
                             <string>request_other</string>
                             <string>_getiter_</string>
                             <string>k</string>
@@ -182,7 +198,6 @@
                             <string>idx</string>
                             <string>report_section</string>
                             <string>doc</string>
-                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_deferred_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/bt/revision?rev=24234&r1=24233&r2=24234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_deferred_style/bt/revision Fri Oct 17 17:53:35 2008
@@ -1,1 +1,1 @@
-29
+31