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

Author: thomasdesvenain
Date: Tue Dec  7 22:22:30 2010
New Revision: 13334

Modified:
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py
Log:
Fixed: startup_directory option was broken.

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt	Tue Dec  7 22:22:30 2010
@@ -4,6 +4,9 @@
 2.1 - (svn/unreleased)
 ----------------------
 
+* Fixed: startup_directory option was broken.
+  [thomasdesvenain]
+
 * Qualify input tag id to avoid name-clashing. Fixes
   https://dev.plone.org/plone/ticket/11325.
   [malthe]
@@ -58,7 +61,7 @@
 2.0b3 - 02.06.2010
 ------------------
 
-* Use getOverlay() instead of the deprecated getContent() 
+* Use getOverlay() instead of the deprecated getContent()
   Closes http://dev.plone.org/plone/ticket/10548
   [esteele]
 
@@ -93,7 +96,7 @@
 1.0rc1 - 02.04.2010
 -------------------
 
-* fixed widget for path-criterion in Plone 3.3 
+* fixed widget for path-criterion in Plone 3.3
   [tom_gross]
 
 1.0b4 - 18.02.2010

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	Tue Dec  7 22:22:30 2010
@@ -96,8 +96,8 @@
                 if callable(method):
                     method = method()
                 directory = method
-        elif getattr(self, 'startup_directory', None):
-            directory = self.startup_directory
+        elif getattr(widget, 'startup_directory', None):
+            directory = widget.startup_directory
             if not directory.startswith('/'):
                 directory = '/'.join([basepath, directory])
         else:

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	Tue Dec  7 22:22:30 2010
@@ -394,6 +394,15 @@
         self.assertEqual(helper.getStartupDirectory(field),
                          'http://nohost/plone/layer1/layer2/ref')
 
+        # string query
+        field.widget.startup_directory = 'layer2'
+        self.assertEqual(helper.getStartupDirectory(field),
+                         'http://nohost/plone/layer1/layer2')
+
+        field.widget.startup_directory = '/foo/constant'
+        self.assertEqual(helper.getStartupDirectory(field),
+                         'http://nohost/plone/foo/constant')
+
         # dynamic query
         field.widget.startup_directory_method = 'dynamicDirectory'
         self.assertEqual(helper.getStartupDirectory(field),
@@ -565,7 +574,7 @@
 
         body = self.getNormalizedPopup()
         INSERTLINK = re.compile(r'<input type="checkbox" class="insertreference" rel="[0-9a-f]*?" />')
-        INSERTLINK_UUID = re.compile(r'<input type="checkbox" class="insertreference" rel="[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}" />') 
+        INSERTLINK_UUID = re.compile(r'<input type="checkbox" class="insertreference" rel="[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}" />')
 
         ROWS = re.compile(r'<tr.*?>(.*?)</tr>', re.MULTILINE|re.DOTALL)
         self.assertEqual(len(ROWS.findall(body)), wanted_rows)
@@ -578,7 +587,7 @@
         body = self.getNormalizedPopup()
 
         self.assertEqual(len(ROWS.findall(body)), wanted_rows + 1)
-        if HAS_UUID: 
+        if HAS_UUID:
             self.assertEqual(len(INSERTLINK_UUID.findall(body)), wanted_insertlinks)
         else:
             self.assertEqual(len(INSERTLINK.findall(body)), wanted_insertlinks)

------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly 
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus 
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d