[Erp5-report] r26797 - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_skins/erp...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue May 5 10:55:09 CEST 2009


Author: romain
Date: Tue May  5 10:55:05 2009
New Revision: 26797

URL: http://svn.erp5.org?rev=26797&view=rev
Log:
Prevent raising an error when value of a ListField is not in the item list.

Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
    erp5/trunk/bt5/erp5_ods_style/bt/revision

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml?rev=26797&r1=26796&r2=26797&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml [utf8] Tue May  5 10:55:05 2009
@@ -113,8 +113,14 @@
                                   tal:content="value">\n
                               </text:p>\n
                             <tal:block tal:condition="python: value != \'\'">\n
-                              <text:p tal:condition="item_list"\n
-                                    tal:content="python: [str(i[0]).replace(\'&amp;\', \'\') for i in item_list if i[1] == value][0]">\n
+\n
+                              <text:p tal:condition="item_list">\n
+                                <tal:block tal:define="displayed_value_list python: [str(i[0]).replace(\'&amp;\', \'\') for i in item_list if i[1] == value]">\n
+                                  <tal:block tal:condition="displayed_value_list"\n
+                                             tal:replace="python: displayed_value_list[0]" />\n
+                                  <tal:block tal:condition="not: displayed_value_list"\n
+                                             tal:replace="python: value" />\n
+                                </tal:block>\n
                               </text:p>\n
                             </tal:block>\n
                             <tal:block tal:condition="python: value is None">\n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=26797&r1=26796&r2=26797&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] Tue May  5 10:55:05 2009
@@ -1,1 +1,1 @@
-202
+203




More information about the Erp5-report mailing list