[Erp5-report] r38807 jerome - /erp5/trunk/products/ERP5Form/Extensions/

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Sep 30 15:42:10 2010
New Revision: 38807

URL: http://svn.erp5.org?rev=38807&view=rev
Log:
support searching by category strict

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=38807&r1=38806&r2=38807&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py [utf8] Thu Sep 30 15:42:10 2010
@@ -69,8 +69,10 @@ def getSearchDialog(self, REQUEST=None):
     field._surcharged_tales(
         dict(
             default=TALESMethod(
-              'here/portal_selections/%s/%s_relative_url | nothing' 
-                                    % (selection_name, request_key)),
+              'here/portal_selections/%s/%s_relative_url | '
+              'here/portal_selections/%s/strict_%s_relative_url | nothing' 
+                                    % (selection_name, request_key,
+                                       selection_name, request_key)),
             items=TALESMethod('python: getattr(here.portal_categories["%s"],'
                              'here.portal_preferences.getPreference("'
                              'preferred_category_child_item_list_method_id",'
@@ -80,6 +82,20 @@ def getSearchDialog(self, REQUEST=None):
                              'local_sort_id="int_index")' % request_key)),
             ['title', 'items', 'default'])
 
+    field_id = 'your_%s_relative_url_is_strict_' % request_key
+    temp_form.manage_addField(field_id, field_title, 'ProxyField')
+    field = temp_form._getOb(field_id)
+    field.manage_edit_xmlrpc(dict(
+        form_id='Base_viewFieldLibrary',
+        field_id='your_checkbox'))
+    field._surcharged_edit(dict(title='%s Strict' % field_title), ['title'])
+    field._surcharged_tales(
+        dict(
+            default=TALESMethod(
+              'here/portal_selections/%s/strict_%s_relative_url | nothing' 
+                                    % (selection_name, request_key,))),
+        ['title', 'default'])
+
 
   def addFloatField(field_id, field_title):
     request_key = field_id
@@ -333,7 +349,8 @@ def getSearchDialog(self, REQUEST=None):
     field_id = field.getId()
     if field_id.endswith('search_key') or field_id.endswith('_usage_'):
       temp_form.move_field_group([field_id], default_group, 'right')
-    elif field.get_value('field_id') == 'your_category_list' \
+    elif field.get_value('field_id') in ('your_category_list',
+                                         'your_checkbox') \
         or field_id == 'your_SearchableText':
       temp_form.move_field_group([field_id], default_group, 'center')