fixed DateHTMLProperty for invalid date entry [SF#986538]

Author: Richard Jones

CHANGES.txt

@@ -28,6 +28,7 @@ Fixed:
 - fix messageid generated when msgid is None for send_message (sf bug 987933)
 - make user permissions check more sane (fix search page for anonymous)
 - fixed RDBMS filter() for no matches from full-text search (sf bug 990778)
+- fixed DateHTMLProperty for invalid date entry (sf bug 986538)
 
 
 2004-06-24 0.7.5

roundup/cgi/templating.py

@@ -1378,7 +1378,7 @@ def plain(self):
             offset = self._offset
         return str(self._value.local(offset))
 
-    def now(self, str_interval = None):
+    def now(self, str_interval=None):
         ''' Return the current time.
 
             This is useful for defaulting a new value. Returns a
@@ -1402,7 +1402,7 @@ def now(self, str_interval = None):
         return DateHTMLProperty(self._client, self._classname, self._nodeid,
             self._prop, self._formname, ret)
 
-    def field(self, size = 30, default = None):
+    def field(self, size=30, default=None):
         ''' Render a form edit field for the property
 
             If not editable, just display the value via plain().
@@ -1422,12 +1422,14 @@ def field(self, size = 30, default = None):
                 else:
                     raise ValueError, _('default value for '
                         'DateHTMLProperty must be either DateHTMLProperty '
-			'or string date representation.')
+                        'or string date representation.')
         else:
             raw_value = self._value
 
         if raw_value is None:
             value = ''
+        elif type(raw_value) is type(''):
+            value = raw_value
         else:
             tz = self._db.getUserTimezone()
             value = cgi.escape(str(raw_value.local(tz)))