[Erp5-report] r21071 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web/...

[nobody at svn.erp5.org]

Author: yo
Date: Wed May 21 19:35:37 2008
New Revision: 21071

URL: http://svn.erp5.org?rev=21071&view=rev
Log:
2008-05-21 yo
* Try an English version if no document is found for a given language.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml
    erp5/trunk/bt5/erp5_web/bt/change_log
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml?rev=21071&r1=21070&r2=21071&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml Wed May 21 19:35:37 2008
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -110,23 +107,28 @@
                                group_by=(\'reference\',),\n
                                **kw)\n
 \n
-try:\n
-  # Try to get the first page on the list\n
-  web_page = web_page_list[0]\n
-  web_page = web_page.getObject()\n
-except IndexError:\n
+if len(web_page_list) == 0 and language != \'en\':\n
+  # Search again with English as a fallback.\n
+  web_page_list = portal_catalog(reference=name, portal_type=valid_portal_type_list,\n
+                                 language=\'en\',\n
+                                 order_by=[(\'version\', \'descending\')],\n
+                                 group_by=(\'reference\',),\n
+                                 **kw)\n
+\n
+if len(web_page_list) == 0:\n
   # Search again without the language\n
   web_page_list = portal_catalog(reference=name, portal_type=\'Web Page\', \n
                                  order_by=[(\'version\', \'descending\')],\n
                                  group_by=(\'reference\',),\n
                                  **kw)\n
-  try:\n
-    # Try to get the first page on the list\n
-    web_page = web_page_list[0]\n
-    web_page = web_page.getObject()\n
-  except IndexError:\n
-    # Default returns None\n
-    web_page = None\n
+\n
+if len(web_page_list) == 0:\n
+  # Default returns None\n
+  web_page = None\n
+else:\n
+  # Try to get the first page on the list\n
+  web_page = web_page_list[0]\n
+  web_page = web_page.getObject()\n
 \n
 # return the web page\n
 return web_page\n
@@ -191,8 +193,8 @@
                             <string>_write_</string>
                             <string>_apply_</string>
                             <string>web_page_list</string>
+                            <string>len</string>
                             <string>web_page</string>
-                            <string>IndexError</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_web/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/change_log?rev=21071&r1=21070&r2=21071&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_web/bt/change_log Wed May 21 19:35:37 2008
@@ -1,3 +1,6 @@
+2008-05-21 yo
+* Try an English version if no document is found for a given language.
+
 2008-4-17 yusei
 * Revise version to 5.0.
 

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=21071&r1=21070&r2=21071&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Wed May 21 19:35:37 2008
@@ -1,1 +1,1 @@
-630
+631