[Erp5-report] r33165 ivan - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateI...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Mar  1 09:27:32 2010
New Revision: 33165

URL: http://svn.erp5.org?rev=33165&view=rev
Log:
If no search criteria has been specified , refuse to conduct any search and show a message to user.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml?rev=33165&r1=33164&r2=33165&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml [utf8] Mon Mar  1 09:27:32 2010
@@ -75,6 +75,12 @@
 else:\n
   search_context = context.getPortalObject()\n
 \n
+if field_your_search_text in (\'\', None):\n
+  # no search criteria specified, refuse to conduct any search and \n
+  # show a message to user\n
+  kw[\'portal_status_message\'] = \'Please specify search criteria.\'\n
+  return search_context.Base_redirect(\'view\', keep_items=kw)\n
+  \n
 return search_context.Base_redirect(field_your_search_form_id, keep_items=kw)\n
 </string> </value>
         </item>
@@ -126,6 +132,7 @@
                             <string>bool</string>
                             <string>False</string>
                             <string>search_context</string>
+                            <string>_write_</string>
                           </tuple>
                         </value>
                     </item>

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=33165&r1=33164&r2=33165&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Mon Mar  1 09:27:32 2010
@@ -1,1 +1,1 @@
-1488
+1490