used get_groups(include_empty=1) instead of just get_groups

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

product/ERP5/skins/erp5_html_style/create_relation_dialog.pt

@@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                   global row_keys python:['None'];
                   form_id request/form_id;
                   base_form python:getattr(here,form_id);
-                  groups base_form/get_groups;
+                  groups python: base_form.get_groups(include_empty=1);
                   all_columns python:base_form.get_fields_in_group(groups[0])[0].get_value('all_columns')">
   <table class="Border" width="100%">
     <tr><td valign="top">

product/ERP5/skins/erp5_html_style/dialog_master.pt

@@ -117,13 +117,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
         <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
             border="0" alt="img"/></td>
         <td align="left"
-          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER">
+          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER;
+                      previous_form_id request/previous_form_id | nothing">
           <img src="/images/pro/images/spacer.png" width="5" height="5"
             border="0" alt="img"/>
           <input type="hidden" name="dialog_method" value="cancel_url"
                 tal:attributes="value python: form.action"/>
           <input type="hidden" name="cancel_url" value="cancel_url"
                 tal:attributes="value cancel_url">
+          <input type="hidden" name="previous_form_id" value="previous_form_id"
+                tal:attributes="value previous_form_id">
           <input type="Submit"  value="Cancel" name="base_cancel:method"
                 />&nbsp;
           <input type="Submit"  value="Search"

product/ERP5/skins/erp5_html_style/form_create_relation_dialog.pt

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <div class="Search">
 
 
-<span tal:define="groups form/get_groups;
+<span tal:define="groups python: form.get_groups(include_empty=1);
                   field_errors python: request.get('field_errors',{});
                   dummy python: request.set('here',here)">
       <table width="100%">

product/ERP5/skins/erp5_html_style/form_dialog.pt

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <div class="Search">
 
 
-<span tal:define="groups form/get_groups;
+<span tal:define="groups python: form.get_groups(include_empty=1);
                   field_errors python: request.get('field_errors',{});
                   dummy python: request.set('here',here)">
   <table class="Border" width="100%">

product/ERP5/skins/erp5_html_style/form_folder_delete.pt

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <div class="Search">
 
 
-<span tal:define="groups form/get_groups;
+<span tal:define="groups python: form.get_groups(include_empty=1);
                   field_errors python: request.get('field_errors',{});
                   dummy python: request.set('here',here)">
 

product/ERP5/skins/erp5_html_style/form_list.pt

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <div class="Main">
 
 
-<span tal:define="groups form/get_groups;
+<span tal:define="groups python: form.get_groups(include_empty=1);
                   field_errors python: request.get('field_errors',{});
                   dummy python: request.set('here',here)">
 

product/ERP5/skins/erp5_html_style/form_list_dialog.pt

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <div class="Search">
 
 
-<span tal:define="groups form/get_groups;
+<span tal:define="groups python: form.get_groups(include_empty=1);
                   field_errors python: request.get('field_errors',{});
                   dummy python: request.set('here',here)">
   <table class="Border" width="100%">

product/ERP5/skins/erp5_html_style/form_sort.pt

@@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 <span tal:define="gettext python:here.gettext;
-                  groups form/get_groups;
+                  groups python: form.get_groups(include_empty=1);
                   sort_on python:here.portal_selections.getSelectionSortOrder(selection_name, REQUEST=request);
                   dummy python: request.set('here',here);
                   global row_index python:0;

product/ERP5/skins/erp5_html_style/form_view.pt

@@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 <span tal:define="gettext python:here.gettext;
-                  groups form/get_groups;
+                  groups python: form.get_groups(include_empty=1);
                   field_errors python: request.get('field_errors',{});
                   dummy python: request.set('here',here)">
   <table class="Border" width="100%" tal:condition="python:len(form.get_fields_in_group(groups[0])) > 0

product/ERP5/skins/erp5_html_style/form_view_dialog.pt

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <div class="Search">
 
 
-<span tal:define="groups form/get_groups;
+<span tal:define="groups python: form.get_groups(include_empty=1);
                   field_errors python: request.get('field_errors',{});
                   dummy python: request.set('here',here)">
   <table class="Border" width="100%">

product/ERP5/skins/erp5_html_style/list_dialog_master.pt

@@ -117,13 +117,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
         <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
             border="0" alt="img"/></td>
         <td align="left"
-          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER">
+          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER;
+                      previous_form_id request/previous_form_id | nothing">
           <img src="/images/pro/images/spacer.png" width="5" height="5"
             border="0" alt="img"/>
           <input type="hidden" name="dialog_method" value="cancel_url"
                 tal:attributes="value python: form.action"/>
           <input type="hidden" name="cancel_url" value="cancel_url"
                 tal:attributes="value cancel_url">
+          <input type="hidden" name="previous_form_id" value="previous_form_id"
+                tal:attributes="value previous_form_id">
           <input type="Submit"  value="Cancel" name="base_cancel:method"
                 />&nbsp;
           <input type="Submit"  value="Search"

product/ERP5/skins/erp5_html_style/view_dialog_master.pt

@@ -118,13 +118,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
         <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
             border="0" alt="img"/></td>
         <td align="left"
-          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER">
+          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER;
+                      previous_form_id request/previous_form_id | nothing">
           <img src="/images/pro/images/spacer.png" width="5" height="5"
             border="0" alt="img"/>
           <input type="hidden" name="dialog_method" value="cancel_url"
                 tal:attributes="value python: form.action"/>
           <input type="hidden" name="cancel_url" value="cancel_url"
                 tal:attributes="value cancel_url">
+          <input type="hidden" name="previous_form_id" value="previous_form_id"
+                tal:attributes="value previous_form_id">
           <input type="Submit"  value="Cancel" name="base_cancel:method"
                 />&nbsp;
           <input type="Submit"  value="Search"