Changeset 6868 for main

Timestamp:

10 Oct 2011, 15:18:08 (13 years ago)

Author:

Henrik Bettermann

Message:

We don't need the class FormattedDatetimeDisplayWidget?. The FriendlyDatetimeDisplayWidget? function can also use the FormattedDateDisplayWidget? class instead.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/widgets/datewidget.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/widgets/datewidget.py

@@ -69 +69 @@
             return ""
         content = content.strftime(self.date_format)
-        return renderElement("span", contents=escape(content),
-                             cssClass=self.cssClass)
-
-class FormattedDatetimeDisplayWidget(DatetimeDisplayWidget):
-    """A datetime widget that supports different (and _explicit_) date formats.
-
-    This is a display widget.
-    """
-    datetime_format = '%Y-%m-%d %H:%M:%S'
-    implements(IDisplayWidget)
-
-    def __call__(self):
-        if self._renderedValueSet():
-            content = self._data
-        else:
-            content = self.context.default
-        if content == self.context.missing_value:
-            return ""
-        content = content.strftime(self.datetime_format)
         return renderElement("span", contents=escape(content),
                              cssClass=self.cssClass)
@@ -172 +153 @@
 
     Valid `format` values are the keys of :var:`DATE_FORMATS`
-    dict. Default is ``le`` (little endian; DD/MM/YYYY).
+    dict. Default is ``le`` (little endian; DD/MM/YYYY %H:%M:%S).
 
     This widget is not rendered with a specialized CSS tag for
@@ -181 +162 @@
     datetime_format = date_format + ' %H:%M:%S'
     return CustomWidgetFactory(
-        FormattedDatetimeDisplayWidget,
-        datetime_format=datetime_format)
+        FormattedDateDisplayWidget,
+        date_format=datetime_format)