Changeset 5375 for main/waeup.widgets.core/trunk/src/waeup

Timestamp:

6 Aug 2010, 08:50:03 (14 years ago)

Author:

uli

Message:

Change initialization to support different subwidgets for key and
value parts.

These two subwidgets should are respected by both the input and the
display widget.

File:

• main/waeup.widgets.core/trunk/src/waeup/widgets/core/dictwidget.py (modified) (5 diffs)

main/waeup.widgets.core/trunk/src/waeup/widgets/core/dictwidget.py

@@ -48 +48 @@
     template = ViewPageTemplateFile('dictwidget.pt')
     
-    def __init__(self, context, request, subwidget=None):
+    def __init__(self, context, request, key_subwidget=None,
+                 value_subwidget=None):
         super(DictWidget, self).__init__(context, None, request)
-        self.subwidget = subwidget
+        self.key_subwidget = key_subwidget
+        self.value_subwidget = value_subwidget
 
         # The subwidgets are cached in this dict if preserve_widgets is True.
@@ -69 +71 @@
         if i not in self._widgets:
             key_field = self.context.key_type
-            if self.subwidget is not None:
-                key_widget = self.subwidget(key_field, self.request)
+            if self.key_subwidget is not None:
+                key_widget = self.key_subwidget(key_field, self.request)
             else:
                 key_widget = getMultiAdapter(
@@ -77 +79 @@
             
             value_field = self.context.value_type
-            if self.subwidget is not None:
-                value_widget = self.subwidget(value_field, self.request)
+            if self.value_subwidget is not None:
+                value_widget = self.value_subwidget(value_field, self.request)
             else:
                 value_widget = getMultiAdapter(
@@ -224 +226 @@
     extra = ""
 
-    def __init__(self, context, request, subwidget=None):
+    def __init__(self, context, request, key_subwidget=None,
+                 value_subwidget=None):
         super(DictDisplayWidget, self).__init__(context, request)
-        self.subwidget = subwidget
+        self.key_subwidget = key_subwidget
+        self.value_subwidget = value_subwidget
 
     def __call__(self):
@@ -266 +270 @@
         key_field = self.context.key_type
         value_field = self.context.value_type
-        if self.subwidget is not None:
-            key_widget = self.subwidget(key_field, self.request)
-            value_widget = self.subwidget(value_field, self.request)
+        if self.key_subwidget is not None:
+            key_widget = self.key_subwidget(key_field, self.request)
         else:
             key_widget = getMultiAdapter(
                 (key_field, self.request), IDisplayWidget)
+        if self.value_subwidget is not None:
+            value_widget = self.value_subwidget(value_field, self.request)
+        else:
             value_widget = getMultiAdapter(
                 (value_field, self.request), IDisplayWidget)