Refer field groups by their name, not their index in the list for fields, like...

Refer field groups by their name, not their index in the list for fields, like in xhtml style (not html style).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15726 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml

@@ -59,13 +59,10 @@
   <subject>Print Example</subject>\n
   <content>\n
   <tal:block metal:define-macro="form_layout"\n
-     tal:define="groups python: form.get_groups(include_empty=1);\n
-                 field_errors python: request.get(\'field_errors\',{});\n
-                 dummy python: request.set(\'here\',here);\n
-                 listbox python:form.get_fields_in_group(groups[0])[0];">\n
+     tal:define="dummy python: request.set(\'here\',here);\n
+                 listbox form/listbox | nothing;">\n
 \n
-\n
-    <tal:block tal:condition="python: listbox.meta_type == \'ListBox\'">\n
+    <tal:block tal:condition="listbox">\n
       <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n
     </tal:block>\n
 \n

bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml

@@ -65,15 +65,12 @@
   <subject>Print Example</subject>\n
   <content>\n
   <tal:block metal:define-macro="form_layout"\n
-             tal:define="group_list python: form.get_groups(include_empty=1);\n
-                       field_errors python: request.get(\'field_errors\',{});\n
-                       dummy python: request.set(\'here\',here); ">\n
+             tal:define="dummy python: request.set(\'here\',here); ">\n
 \n
 \n
-    <tal:block tal:repeat="group python: group_list[:3]">\n
+    <tal:block tal:repeat="group python: [\'Default\', \'left\', \'right\', \'center\']">\n
       <tal:block tal:define="field_list python: form.get_fields_in_group(group)">\n
-        <tal:block tal:condition="python: field_list not in [None, []]">\n
-\n
+        <tal:block tal:condition="field_list">\n
           <table splitbyrow="1" repeatrows="0" repeatcols="0"  style="AttributesTable" >\n
             <tal:block tal:repeat="field field_list">\n
               <tal:block tal:condition="python:field.meta_type != \'HiddenStringField\'">\n
@@ -115,36 +112,25 @@
 \n
         </tal:block>\n
       </tal:block>\n
-\n
-\n
     </tal:block>\n
 \n
-    <tal:block tal:condition="python: len(group_list) > 3">\n
-      <tal:block tal:define="field_list python: form.get_fields_in_group(group_list[3])">\n
-        <tal:block tal:condition="python: field_list not in [None, []]">\n
-          <tal:block tal:repeat="field field_list">\n
+      <tal:block tal:define="field_list python: form.get_fields_in_group(\'bottom\')">\n
+        <tal:block tal:repeat="field field_list">\n
 \n
-            <tal:block tal:condition="python: field.meta_type == \'MatrixBox\'">\n
-              <tal:block  tal:define="matrixbox python:field;">\n
-                <div metal:use-macro="here/matrixbox_pdf_macro/macros/matrixbox" />\n
-              </tal:block>\n
+          <tal:block tal:condition="python: field.meta_type == \'MatrixBox\'">\n
+            <tal:block  tal:define="matrixbox python:field;">\n
+              <div metal:use-macro="here/matrixbox_pdf_macro/macros/matrixbox" />\n
             </tal:block>\n
+          </tal:block>\n
 \n
-\n
-\n
-            <tal:block tal:condition="python: field.meta_type == \'ListBox\'">\n
-\n
-              <tal:block  tal:define="listbox python:field;" >\n
-                <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n
-              </tal:block>\n
-\n
-              <table><tr><td tal:content="python: \' \'"></td></tr></table>\n
-\n
+          <tal:block tal:condition="python: field.meta_type == \'ListBox\'">\n
+            <tal:block  tal:define="listbox python:field;" >\n
+              <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n
             </tal:block>\n
+            <table><tr><td tal:content="python: \' \'"></td></tr></table>\n
           </tal:block>\n
         </tal:block>\n
       </tal:block>\n
-    </tal:block>\n
 \n
 \n
   </tal:block>\n

bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml

@@ -77,9 +77,9 @@
 \n
    <spacer height="100" tal:condition="form/get_fields"/>\n
 \n
-    <tal:block tal:repeat="group python: group_list[:3]">\n
+    <tal:block tal:repeat="group python: [\'Default\', \'left\', \'right\', \'center\']">\n
       <tal:block tal:define="field_list python: form.get_fields_in_group(group)">\n
-        <tal:block tal:condition="python: field_list not in [None, []]">\n
+        <tal:block tal:condition="field_list">\n
 \n
           <table splitbyrow="1" repeatrows="0" repeatcols="0"  style="AttributesTable" >\n
             <tal:block tal:repeat="field field_list">\n
@@ -110,36 +110,28 @@
 \n
         </tal:block>\n
       </tal:block>\n
-\n
-\n
     </tal:block>\n
 \n
-    <tal:block tal:condition="python: len(group_list) > 3">\n
-      <tal:block tal:define="field_list python: form.get_fields_in_group(group_list[3])">\n
-        <tal:block tal:condition="python: field_list not in [None, []]">\n
+      <tal:block tal:define="field_list python: form.get_fields_in_group(\'bottom\')">\n
+        <tal:block tal:condition="field_list">\n
           <tal:block tal:repeat="field field_list">\n
-\n
+        \n
             <tal:block tal:condition="python: field.meta_type == \'MatrixBox\'">\n
               <tal:block  tal:define="matrixbox python:field;">\n
                 <div metal:use-macro="here/matrixbox_pdf_macro/macros/matrixbox" />\n
               </tal:block>\n
             </tal:block>\n
-\n
-\n
 \n
             <tal:block tal:condition="python: field.meta_type == \'ListBox\'">\n
-\n
               <tal:block  tal:define="listbox python:field;" >\n
                 <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n
               </tal:block>\n
-\n
               <table><tr><td tal:content="python: \' \'"></td></tr></table>\n
 \n
             </tal:block>\n
           </tal:block>\n
         </tal:block>\n
       </tal:block>\n
-    </tal:block>\n
 \n
 \n
    <spacer height="100"/>\n

bt5/erp5_pdf_style/bt/revision

-36
+38
\ No newline at end of file