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

[nobody at svn.erp5.org]

Author: thibaut
Date: Fri Aug 29 16:17:19 2008
New Revision: 23297

URL: http://svn.erp5.org?rev=23297&view=rev
Log:
2008-08-29 thibaut
when we have an editable field is a date in the listbox, now this field can be proxify.

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

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml?rev=23297&r1=23296&r2=23297&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml Fri Aug 29 16:17:19 2008
@@ -123,23 +123,25 @@
                   </table:table-cell>\n
                 </tal:block>\n
                 <tal:block tal:condition="python: field is not None">\n
-                  <tal:block tal:condition="python:field.meta_type==\'DateTimeField\' and field.get_value(\'date_only\')"> \n
-                    <table:table-cell tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n
+                  <tal:block tal:condition="python:field.meta_type==\'DateTimeField\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'DateTimeField\')">\n
+                    <tal:block tal:condition="python:field.get_value(\'date_only\')">\n
+                      <table:table-cell tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n
                                       table:style-name string:${style_prefix}date;"\n
                                       table:style-name="date"\n
                                       office:value-type="date">\n
-                      <text:p tal:content="python: field.render_pdf(value)"/>\n
-                    </table:table-cell>\n
-                  </tal:block>\n
-                  <tal:block tal:condition="python:field.meta_type==\'DateTimeField\' and field.get_value(\'date_only\')==0">\n
-                    <table:table-cell tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n
+                        <text:p tal:content="python: field.render_pdf(value)"/>\n
+                      </table:table-cell>\n
+                    </tal:block>\n
+                    <tal:block tal:condition="python:field.get_value(\'date_only\')==0">\n
+                      <table:table-cell tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n
                                       table:style-name string:${style_prefix}date_with_time;"\n
                                       table:style-name="date_with_time"\n
                                       office:value-type="date">\n
-                      <text:p tal:content="python: field.render_pdf(value)"/>\n
-                    </table:table-cell>\n
+                        <text:p tal:content="python: field.render_pdf(value)"/>\n
+                      </table:table-cell>\n
+                    </tal:block>\n
                   </tal:block>\n
-                  <tal:block tal:condition="python:field.meta_type!=\'DateTimeField\'">\n
+                  <tal:block tal:condition="python:field.meta_type!=\'DateTimeField\' and field.meta_type!=\'ProxyField\'">\n
                     <table:table-cell tal:attributes="table:style-name string:${style_prefix}string;"\n
                                       table:style-name="string"\n
                                       office:value-type="string">\n
@@ -148,7 +150,7 @@
                   </tal:block>\n
                 </tal:block>\n
               </tal:block>\n
-            </tal:block>            \n
+            </tal:block>\n
             <tal:block tal:condition="python:not isinstance(value, DateTime)">\n
              <table:table-cell tal:define="field python: editable_fields.get(column_id, None)"\n
                                tal:attributes="table:style-name string:${style_prefix}text"\n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=23297&r1=23296&r2=23297&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision Fri Aug 29 16:17:19 2008
@@ -1,1 +1,1 @@
-147
+150