Changeset 8152 for main/waeup.kofa/trunk/src

Timestamp:

14 Apr 2012, 14:13:39 (12 years ago)

Author:

uli

Message:

• Add new default date widgets for different date formats.

• In FormattedDateWidgets? use own default also, if no date format was set with the connected schema field. In former implementation we expected always a valid date_format from connected schema field or no date_format at all. But as FormattedDate? schema fields now may also return None as date_format, which means that the date_format was not set at all in the interface, we can override this value with respective default values.

As a result, when setting no date_format in an interface with
FormattedDate? schema fields and when rendered with one of the
FormattedDateWidgets?, the default format of the respective widget
will be used to render the value: %d.%m.%Y for german dates, etc.

File:

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

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

@@ -90 +90 @@
     def __init__(self, context, request, *args, **kw):
         # try to grab date_format and show_year from bound schema field.
-        self.date_format = getattr(context, 'date_format', self.date_format)
+        date_format = getattr(context, 'date_format', self.date_format)
+        if date_format is not None:
+            self.date_format = date_format
         self.show_year = getattr(context, 'show_year', self.show_year)
         # add css class determined by date_format and show_year
@@ -136 +138 @@
     def __init__(self, context, request, *args, **kw):
         # try to grab date_format and show_year from bound schema field.
-        self.date_format = getattr(context, 'date_format', self.date_format)
+        date_format = getattr(context, 'date_format', self.date_format)
+        if date_format is not None:
+            self.date_format = date_format
         self.show_year = getattr(context, 'show_year', self.show_year)
         return super(FormattedDateDisplayWidget, self).__init__(
@@ -152 +156 @@
                              cssClass=self.cssClass)
 
+class DateLEWidget(FormattedDateWidget):
+    date_format = '%d/%m/%Y'
+
+class DateDEWidget(FormattedDateWidget):
+    date_format = '%d.%m.%Y'
+
+class DateUSWidget(FormattedDateWidget):
+    date_format = '%m/%d/%Y'
+
+class DateLEDisplayWidget(FormattedDateDisplayWidget):
+    date_format = '%d/%m/%Y'
+
+class DateDEDisplayWidget(FormattedDateDisplayWidget):
+    date_format = '%d.%m.%Y'
+
+class DateUSDisplayWidget(FormattedDateDisplayWidget):
+    date_format = '%m/%d/%Y'
+
 def FriendlyDateWidget(format):
     """Get a friendly date input widget for `format`.