Merge lp:~replaceafill/schooltool/flourish_960367 into lp:schooltool/flourish

[Douglas Cerna]

Sorry, to bother you, but could you check this change? I'm not sure if the str(value) part in the toWidgetValue can bite us later. Is there a better way to let the user to fix the wrong date he already has in the system?

Thanks!

[Justas Sadzevičius (justas.sadzevicius)]

Looks OK from the first glance.

review: Approve

=== modified file 'src/schooltool/skin/widgets.py'
--- src/schooltool/skin/widgets.py	2011-12-19 17:46:21 +0000
+++ src/schooltool/skin/widgets.py	2012-03-21 17:05:29 +0000
@@ -79,18 +79,30 @@
         """See interfaces.IDataConverter"""
         if value is self.field.missing_value:
             return u''
-        return value.strftime("%Y-%m-%d")
+        try:
+            return value.strftime("%Y-%m-%d")
+        except (ValueError,):
+            # XXX: may be evil, but this allows users to fix incorrect
+            #      dates entered before we added the >= 1900 check
+            return str(value)
 
     def toFieldValue(self, value):
         """See interfaces.IDataConverter"""
         if value == u'':
             return self.field.missing_value
         try:
-            return parse_date(value)
-        except ValueError, err:
+            value = parse_date(value)
+        except (ValueError,):
             raise FormatterValidationError(
                 _("The datetime string did not match the pattern yyyy-mm-dd"),
                 value)
+        try:
+            value.strftime("%Y-%m-%d")
+        except (ValueError,):
+            raise FormatterValidationError(
+                _('Year has to be equal or greater than 1900'),
+                value)
+        return value
 
 
 class IFCKConfig(Interface):