[Erp5-report] r38808 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplat...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Sep 30 15:43:50 2010
New Revision: 38808

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

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml?rev=38808&r1=38807&r2=38808&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml [utf8] Thu Sep 30 15:43:50 2010
@@ -65,12 +65,12 @@ def sorted(seq):\n
 # the entered value, and what was the usage.\n
 \n
 # Note that we don\'t use queries, because we want to let the catalog filter out\n
-# ignored parameters  by itself.\n
+# ignored parameters by itself.\n
 \n
-usage_map =  dict(min=\'>=\',\n
-                  max=\'<\',\n
-                  ngt=\'<=\',\n
-                  nlt=\'>\',)\n
+usage_map = dict(min=\'>=\',\n
+                 max=\'<\',\n
+                 ngt=\'<=\',\n
+                 nlt=\'>\',)\n
 \n
 new_mapping = dict(ignore_hide_rows=1)\n
 for key in sorted(request.form.keys()):\n
@@ -78,10 +78,10 @@ for key in sorted(request.form.keys()):\
   value = request.form[key]\n
 \n
   # to remove unnecessary None value\n
-  if value == None:\n
+  if value is None:\n
     request.form.pop(key)\n
     continue\n
-\n
+  \n
   # workaround the bogus case where a value is passed ?value=None\n
   if value == \'None\':\n
     value = None\n
@@ -106,7 +106,10 @@ for key in sorted(request.form.keys()):\
     new_mapping[real_key] = \'%s %s\' % (usage_map[value], new_mapping[real_key])\n
 \n
   else:\n
-    new_mapping[key] = value\n
+    if request.form.get(\'%s_is_strict_\' % key):\n
+      new_mapping[\'strict_%s\' % key] = value\n
+    else:\n
+      new_mapping[key] = value\n
 \n
 # set selection parameters\n
 container.portal_selections.setSelectionParamsFor(selection_name, new_mapping)\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=38808&r1=38807&r2=38808&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Sep 30 15:43:50 2010
@@ -1 +1 @@
-1736
\ No newline at end of file
+1737
\ No newline at end of file