r13758 - in MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk: docs src/archetypes/referencebrowserwidget/browser src/archetypes/referencebrowserwidget/tests

Author: gotcha
Date: Fri Aug 19 09:16:24 2011
New Revision: 13758

Modified:
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/CHANGES.txt
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py
Log:
text searches should search outside navigation root

fixes https://dev.plone.org/plone/ticket/12120


Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/CHANGES.txt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/CHANGES.txt	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/CHANGES.txt	Fri Aug 19 09:16:24 2011
@@ -4,6 +4,9 @@
 2.4.4 - unreleased
 ------------------
 
+* Fix: text searches should search outside navigation root
+  [gotcha]
+
 2.4.3 - 2011-07-04
 ------------------
 

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py	Fri Aug 19 09:16:24 2011
@@ -138,9 +138,6 @@
             query[k] = q = {'query': qs}
             q.update(v)
 
-        if 'path' not in query:
-            query['path'] = getNavigationRoot(self.context)
-
 # doesn't normal call catalog unless some field has been queried
 # against. if you want to call the catalog _regardless_ of whether
 # any items were found, then you can pass show_all=1.

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py	Fri Aug 19 09:16:24 2011
@@ -295,6 +295,7 @@
         self.assertEqual(popup.at_url, '/plone/layer1/layer2/with%20space')
 
     def test_subsite_query(self):
+        """searches should not be restricted to subsites"""
         self.loginAsPortalOwner()
         self.portal.invokeFactory('Document', 'welcome-site')
         self.portal.invokeFactory('Folder', 'subsite')
@@ -305,8 +306,8 @@
         fieldname = 'multiRef3'
         self.request.set('SearchableText', 'welcome')
         results = subsite.restrictedTraverse('@@refbrowser_querycatalog')()
-        self.assertEqual(len(results), 1)
-        self.assertEqual(results[0].getId, 'welcome-subsite')
+        # content outside subsite should also be returned
+        self.assertTrue(len(results) > 1)
 
 
 class PopupBreadcrumbTestCase(PopupBaseTestCase):

------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2