[Erp5-report] r36410 jerome - /erp5/trunk/products/ERP5Form/Extensions/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jun 17 10:24:34 CEST 2010
Author: jerome
Date: Thu Jun 17 10:24:32 2010
New Revision: 36410
URL: http://svn.erp5.org?rev=36410&view=rev
Log:
fix indentation problem from 36401
Modified:
erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py
Modified: erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py?rev=36410&r1=36409&r2=36410&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py [utf8] Thu Jun 17 10:24:32 2010
@@ -241,28 +241,28 @@ def getSearchDialog(self, REQUEST=None):
continue
- if column_id in catalog_schema:
- if column_id.endswith('state') or column_id.endswith('state_title'):
- # this is a workflow state, it will be handled later
- continue
- elif 'date' in column_id:
- # is it date ? -> provide exact + range
- # TODO: do we need an API in catalog for this ?
- addDateTimeField(column_id, column_title)
-
- elif 'quantity' in column_id or 'price' in column_id:
- # is it float ? -> provide exact + range
- # TODO: do we need an API in catalog for this ?
- addFloatField(column_id, column_title)
+ if column_id in catalog_schema:
+ if column_id.endswith('state') or column_id.endswith('state_title'):
+ # this is a workflow state, it will be handled later
+ continue
+ elif 'date' in column_id:
+ # is it date ? -> provide exact + range
+ # TODO: do we need an API in catalog for this ?
+ addDateTimeField(column_id, column_title)
+
+ elif 'quantity' in column_id or 'price' in column_id:
+ # is it float ? -> provide exact + range
+ # TODO: do we need an API in catalog for this ?
+ addFloatField(column_id, column_title)
+ else:
+ if column_id in sql_catalog_full_text_search_keys:
+ addFullTextStringField(column_id, column_title)
else:
- if column_id in sql_catalog_full_text_search_keys:
- addFullTextStringField(column_id, column_title)
- else:
- default_search_key = 'ExactMatch'
- if column_id in sql_catalog_keyword_search_keys:
- default_search_key = 'Keyword'
- addKeywordSearchStringField(column_id, column_title,
- default_search_key=default_search_key)
+ default_search_key = 'ExactMatch'
+ if column_id in sql_catalog_keyword_search_keys:
+ default_search_key = 'Keyword'
+ addKeywordSearchStringField(column_id, column_title,
+ default_search_key=default_search_key)
allowed_content_types = self.getTypeInfo().getTypeAllowedContentTypeList()
# remember which workflow we already displayed
More information about the Erp5-report
mailing list