[Erp5-report] r38732 fabien - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/e...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Sep 28 16:43:06 CEST 2010


Author: fabien
Date: Tue Sep 28 16:43:00 2010
New Revision: 38732

URL: http://svn.erp5.org?rev=38732&view=rev
Log:
remove the hardcoded language 'en' to use the localizer default language
-> This is the work of François-Xavier Algrain

Add Assignee proxy role to make possible for annonymous to get the notification
document

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml?rev=38732&r1=38731&r2=38732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml [utf8] Tue Sep 28 16:43:00 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -71,6 +68,9 @@ valid_portal_type_list = (\'Notification
 if language is None:\n
   language = portal.Localizer.get_selected_language()\n
 \n
+# Find the default language\n
+default_language = portal.Localizer.get_default_language() or \'en\'\n
+\n
 if validation_state is None:\n
   validation_state = (\'validated\',)\n
 \n
@@ -85,12 +85,12 @@ notification_message_list = portal_catal
                                            group_by=(\'reference\',),\n
                                            **kw)\n
 \n
-if len(notification_message_list) == 0 and language != \'en\':\n
+if len(notification_message_list) == 0 and language != default_language:\n
   # Search again with English as a fallback.\n
   notification_message_list = portal_catalog(reference=reference,\n
                                              portal_type=valid_portal_type_list,\n
                                              validation_state=validation_state,\n
-                                             language=\'en\',\n
+                                             language=default_language,\n
                                              sort_on=[(\'version\', \'descending\')],\n
                                              group_by=(\'reference\',),\n
                                              **kw)\n
@@ -129,7 +129,9 @@ return notification_message\n
         <item>
             <key> <string>_proxy_roles</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>Assignee</string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -166,6 +168,7 @@ return notification_message\n
                             <string>portal_catalog</string>
                             <string>valid_portal_type_list</string>
                             <string>None</string>
+                            <string>default_language</string>
                             <string>_apply_</string>
                             <string>notification_message_list</string>
                             <string>len</string>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38732&r1=38731&r2=38732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Tue Sep 28 16:43:00 2010
@@ -1 +1 @@
-863
\ No newline at end of file
+864
\ No newline at end of file




More information about the Erp5-report mailing list