[Erp5-report] r33188 ivan - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Mar  1 16:10:25 2010
New Revision: 33188

URL: http://svn.erp5.org?rev=33188&view=rev
Log:
Revert part of r33150. (Using selections it is possible to have different list modes).

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml?rev=33188&r1=33187&r2=33188&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml [utf8] Mon Mar  1 16:10:25 2010
@@ -74,6 +74,13 @@
 if searchabletext is None:\n
   # searchabletext can be supplied in request (fallback)\n
   searchabletext = context.REQUEST.get(\'searchabletext\')\n
+  \n
+if searchabletext is None:\n
+  # or in selection\n
+  selection_id = \'search_advanced_dialog_selection\'\n
+  selection_object = portal.portal_selections.getSelectionParamsFor(selection_id)\n
+  if selection_object:\n
+    searchabletext = selection_object.get(\'searchabletext\')\n
 \n
 if searchabletext is None:\n
   raise ValueError, "No search string specified."\n
@@ -170,6 +177,8 @@
                             <string>query_kw</string>
                             <string>date_format</string>
                             <string>None</string>
+                            <string>selection_id</string>
+                            <string>selection_object</string>
                             <string>ValueError</string>
                             <string>parsed_search_string</string>
                             <string>portal_type</string>

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml?rev=33188&r1=33187&r2=33188&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml [utf8] Mon Mar  1 16:10:25 2010
@@ -55,11 +55,23 @@
             <key> <string>_body</string> </key>
             <value> <string>"""\n
   Puts all the arguments from advanced search dialog form together as \n
-  a parseable search string. Set it in the request to pass it \n
-  on to search form.\n
+  a parseable search string. Set it in the selection so it can be used\n
+  in search form.\n
 """\n
+portal = context.getPortalObject()\n
 searchabletext = context.Base_assembleSearchString()\n
-context.REQUEST.set(\'searchabletext\', searchabletext)\n
+\n
+selection_id = \'search_advanced_dialog_selection\'\n
+selection_object = portal.portal_selections.getSelectionParamsFor(selection_id, {})\n
+if selection_object:\n
+  # update\n
+  selection_object[\'searchabletext\'] = searchabletext\n
+else:\n
+  selection_object = {\'searchabletext\': searchabletext}\n
+\n
+selection_object[\'list_style\'] = \'search\'\n
+portal.portal_selections.setSelectionParamsFor(selection_id, \\\n
+                                               selection_object)\n
 return context.Base_viewAdvancedSearchResultList()\n
 </string> </value>
         </item>
@@ -101,7 +113,11 @@
                             <string>kw</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>portal</string>
                             <string>searchabletext</string>
+                            <string>selection_id</string>
+                            <string>selection_object</string>
+                            <string>_write_</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=33188&r1=33187&r2=33188&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Mon Mar  1 16:10:25 2010
@@ -1,1 +1,1 @@
-1075
+1077