[Checkins] SVN: zope.app.form/branches/3.6/ back ported from trunk:

[Christian Zagrodnick]

Log message for revision 93361:
  back ported from trunk:
  
  - The URIDisplayWidget doesn't render an anchor for empty/None values.
  
  

Changed:
  U   zope.app.form/branches/3.6/CHANGES.txt
  U   zope.app.form/branches/3.6/src/zope/app/form/browser/tests/test_textwidget.py
  U   zope.app.form/branches/3.6/src/zope/app/form/browser/textwidgets.py

-=-
Modified: zope.app.form/branches/3.6/CHANGES.txt
===================================================================
--- zope.app.form/branches/3.6/CHANGES.txt	2008-11-26 09:56:06 UTC (rev 93360)
+++ zope.app.form/branches/3.6/CHANGES.txt	2008-11-26 09:56:39 UTC (rev 93361)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+3.6.4 (unreleased)
+==================
+
+- The URIDisplayWidget doesn't render an anchor for empty/None values.
+
+
 3.6.3 (2008-10-15)
 ==================
 

Modified: zope.app.form/branches/3.6/src/zope/app/form/browser/tests/test_textwidget.py
===================================================================
--- zope.app.form/branches/3.6/src/zope/app/form/browser/tests/test_textwidget.py	2008-11-26 09:56:06 UTC (rev 93360)
+++ zope.app.form/branches/3.6/src/zope/app/form/browser/tests/test_textwidget.py	2008-11-26 09:56:39 UTC (rev 93361)
@@ -150,6 +150,13 @@
         self.verifyResult(self._widget(), ["<a", 'href="uri:fake"',
                                            'target="there"'])
 
+    def testEmptyRenderReturnsEmptyString(self):
+        self._widget.setRenderedValue(None)
+        self.assertEquals(self._widget(), "")
+        self._widget.setRenderedValue('')
+        self.assertEquals(self._widget(), "")
+
+
 class DateDisplayWidgetTest(BrowserWidgetTest):
 
     _WidgetFactory = DateDisplayWidget

Modified: zope.app.form/branches/3.6/src/zope/app/form/browser/textwidgets.py
===================================================================
--- zope.app.form/branches/3.6/src/zope/app/form/browser/textwidgets.py	2008-11-26 09:56:06 UTC (rev 93360)
+++ zope.app.form/branches/3.6/src/zope/app/form/browser/textwidgets.py	2008-11-26 09:56:39 UTC (rev 93361)
@@ -216,6 +216,9 @@
             content = self._data
         else:
             content = self.context.default
+        if not content:
+            # If there is no content it is not useful to render an anchor.
+            return ''
         content = escape(content)
         kw = dict(contents=content, href=content)
         if self.linkTarget: