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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Apr 26 12:14:00 2011
New Revision: 45687

URL: http://svn.erp5.org?rev=45687&view=rev
Log:
a document with empty language is available for any language.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
    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=45687&r1=45686&r2=45687&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml [utf8] Tue Apr 26 12:14:00 2011
@@ -90,8 +90,8 @@ if validation_state is None:\n
 web_page_list = portal_catalog(reference=name,\n
                                portal_type=valid_portal_type_list,\n
                                validation_state=validation_state,\n
-                               language=language,\n
-                               sort_on=[(\'version\', \'descending\')],\n
+                               language=(language, \'\'),\n
+                               sort_on=[(\'language\', \'descending\'), (\'version\', \'descending\')],\n
                                group_by=(\'reference\',),\n
                                **kw)\n
 \n

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml?rev=45687&r1=45686&r2=45687&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml [utf8] Tue Apr 26 12:14:00 2011
@@ -95,7 +95,8 @@ kw</string> </value>
         catalog.creation_date,\n
         catalog.title,\n
         CONCAT(CASE my_versioning.language\n
-                   WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
+                   WHEN <dtml-sqlvar language type="string"> THEN \'4\'\n
+                   WHEN \'\' THEN \'3\'\n
                    WHEN \'en\' THEN \'2\'\n
                    ELSE \'1\' END,\n
                my_versioning.version) AS priority\n
@@ -118,7 +119,7 @@ kw</string> </value>
 \n
         <dtml-if all_languages>\n
         <dtml-else>\n
-          AND my_versioning.language = <dtml-sqlvar language type="string">\n
+          AND my_versioning.language IN (<dtml-sqlvar language type="string">, \'\')\n
         </dtml-if>\n
 \n
         <dtml-if is_translation_order_by>\n

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=45687&r1=45686&r2=45687&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Tue Apr 26 12:14:00 2011
@@ -1 +1 @@
-1043
\ No newline at end of file
+1044
\ No newline at end of file