Changeset 8150 for main/waeup.kofa/trunk

Timestamp:

13 Apr 2012, 21:44:00 (13 years ago)

Author:

uli

Message:

Register FormattedDateDisplayWidget? for FormattedDate? schema type.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (1 diff)
• utils/overrides.zcml (modified) (1 diff)
• widgets/datewidget.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -382 +382 @@
     form_fields = grok.AutoFields(IApplicant).omit(
         'locked', 'course_admitted', 'password')
-    form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     label = _('Applicant')
     pnav = 3

main/waeup.kofa/trunk/src/waeup/kofa/utils/overrides.zcml

@@ -25 +25 @@
       />
 
+  <adapter
+      for="waeup.kofa.schema.interfaces.IFormattedDate
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.formlib.interfaces.IDisplayWidget"
+      factory="waeup.kofa.widgets.datewidget.FormattedDateDisplayWidget"
+      permission="zope.Public"
+      />
+
 </configure>

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

@@ -92 +92 @@
         self.date_format = getattr(context, 'date_format', self.date_format)
         self.show_year = getattr(context, 'show_year', self.show_year)
-        self.cssClass = FORMATS_BY_VALUE.get((
-            self.date_format, self.show_year), self.cssClass)
+        # add css class determined by date_format and show_year
+        css_cls = FORMATS_BY_VALUE.get((self.date_format, self.show_year), '')
+        self.cssClass = ' '.join([self.cssClass, css_cls]).strip()
         return super(FormattedDateWidget, self).__init__(
             context, request, *args, **kw)
@@ -122 +123 @@
         return value
 
+
 class FormattedDateDisplayWidget(DateDisplayWidget):
     """A date widget that supports different (and _explicit_) date formats.
@@ -128 +130 @@
     """
     date_format = '%Y-%m-%d'
+    show_year = False
+
     implements(IDisplayWidget)
+
+    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)
+        self.show_year = getattr(context, 'show_year', self.show_year)
+        return super(FormattedDateDisplayWidget, self).__init__(
+            context, request, *args, **kw)
 
     def __call__(self):