[Erp5-report] r7476 - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: aurel
Date: Wed May 24 13:55:20 2006
New Revision: 7476

URL: http://svn.erp5.org?rev=7476&view=rev
Log:
when exporting catalog method, if is_filter no set, do not export
filter parameter

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=7476&r1=7475&r2=7476&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py Wed May 24 13:55:20 2006
@@ -1479,14 +1479,15 @@
                                                           catalog, method_id)
       self._is_filtered_archive[method_id] = 0
       if catalog.filter_dict.has_key(method_id):
-        self._is_filtered_archive[method_id] = \
-                    catalog.filter_dict[method_id]['filtered']
-        self._filter_expression_archive[method_id] = \
-                    catalog.filter_dict[method_id]['expression']
-        self._filter_expression_instance_archive[method_id] = \
-                    catalog.filter_dict[method_id]['expression_instance']
-        self._filter_type_archive[method_id] = \
-                    catalog.filter_dict[method_id]['type']
+        if catalog.filter_dict[method_id]['filtered']:
+          self._is_filtered_archive[method_id] = \
+                      catalog.filter_dict[method_id]['filtered']
+          self._filter_expression_archive[method_id] = \
+                      catalog.filter_dict[method_id]['expression']
+          self._filter_expression_instance_archive[method_id] = \
+                      catalog.filter_dict[method_id]['expression_instance']
+          self._filter_type_archive[method_id] = \
+                      catalog.filter_dict[method_id]['type']
 
   def export(self, context, bta, **kw):
     if len(self._objects.keys()) == 0:
@@ -1516,21 +1517,22 @@
         xml_data += os.linesep+' </item>'
 
       if catalog.filter_dict.has_key(method_id):
-        xml_data += os.linesep+' <item key="_is_filtered_archive" type="int">'
-        xml_data += os.linesep+'  <value>1</value>'
-        xml_data += os.linesep+' </item>'
-        for method in catalog_method_filter_list:
-          value = getattr(self, method, '')[method_id]
-          if method != '_filter_expression_instance_archive':
-            if type(value) in (type(''), type(u'')):
-              xml_data += os.linesep+' <item key="%s" type="str">' %(method,)
-              xml_data += os.linesep+'  <value>%s</value>' %(str(value))
-              xml_data += os.linesep+' </item>'
-            elif type(value) in (type(()), type([])):
-              xml_data += os.linesep+' <item key="%s" type="tuple">'%(method)
-              for item in value:
-                xml_data += os.linesep+'  <value>%s</value>' %(str(item))
-              xml_data += os.linesep+' </item>'
+        if catalog.filter_dict[method_id]['filtered']:
+          xml_data += os.linesep+' <item key="_is_filtered_archive" type="int">'
+          xml_data += os.linesep+'  <value>1</value>'
+          xml_data += os.linesep+' </item>'
+          for method in catalog_method_filter_list:
+            value = getattr(self, method, '')[method_id]
+            if method != '_filter_expression_instance_archive':
+              if type(value) in (type(''), type(u'')):
+                xml_data += os.linesep+' <item key="%s" type="str">' %(method,)
+                xml_data += os.linesep+'  <value>%s</value>' %(str(value))
+                xml_data += os.linesep+' </item>'
+              elif type(value) in (type(()), type([])):
+                xml_data += os.linesep+' <item key="%s" type="tuple">'%(method)
+                for item in value:
+                  xml_data += os.linesep+'  <value>%s</value>' %(str(item))
+                xml_data += os.linesep+' </item>'
       xml_data += os.linesep+'</catalog_method>'
       f.write(xml_data)
       f.close()