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

Author: thomasdesvenain
Date: Wed Jun  8 20:44:38 2011
New Revision: 13676

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:
Fix: text search searches from navigation root.

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/CHANGES.txt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/CHANGES.txt	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/CHANGES.txt	Wed Jun  8 20:44:38 2011
@@ -4,13 +4,16 @@
 2.4.3 - Unreleased
 ------------------
 
+* Fix: text search searches from navigation root.
+  [thomasdesvenain]
+
 * moved checkPermission from widget template to helper
   [tom_gross]
 
 2.4.2 - 2011-06-02
 ------------------
 
-* Fix : overlay is not closed at item selection when field is multivalued.
+* Fix: overlay is not closed at item selection when field is multivalued.
   [thomasdesvenain]
 
 * Fix undefined variable checkPermission 

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	Wed Jun  8 20:44:38 2011
@@ -12,6 +12,7 @@
 
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.Five import BrowserView
+from plone.app.layout.navigation.root import getNavigationRoot
 
 try:
     # Zope >= 2.13
@@ -137,6 +138,9 @@
             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.
@@ -237,7 +241,6 @@
         if self.widget.show_results_without_query or self.search_text:
             if self.widget.restrict_browsing_to_startup_directory:
                 pass
-
             qc = getMultiAdapter((self.context, self.request),
                                  name='refbrowser_querycatalog')
             result = (self.widget.show_results_without_query or \

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	Wed Jun  8 20:44:38 2011
@@ -10,6 +10,7 @@
 
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.Five import BrowserView
+from zope.interface.declarations import alsoProvides
 try:
     from Testing.testbrowser import Browser  # Zope >= 2.13
 except ImportError:
@@ -293,6 +294,21 @@
         popup = self._getPopup(obj=obj)
         self.assertEqual(popup.at_url, '/plone/layer1/layer2/with%20space')
 
+    def test_subsite_query(self):
+        self.loginAsPortalOwner()
+        self.portal.invokeFactory('Document', 'welcome-site')
+        self.portal.invokeFactory('Folder', 'subsite')
+        subsite = self.portal.subsite
+        subsite.invokeFactory('Document', 'welcome-subsite')
+        zope.interface.alsoProvides(subsite, INavigationRoot)
+
+        fieldname = 'multiRef3'
+        self.request.set('SearchableText', 'welcome')
+        results = subsite.restrictedTraverse('@@refbrowser_querycatalog')()
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0].getId, 'welcome-subsite')
+
+
 class PopupBreadcrumbTestCase(PopupBaseTestCase):
     """ Test the popup breadcrumbs """
 

------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Archetypes-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/archetypes-checkins