Changeset 47429

Timestamp:

07/25/06 21:38:59 (2 years ago)

Author:

fguillaume

Message:

ELHGED-97:
Added code to render "empty" value in lists of complex objects.
An additional cell is available containing widgets with the "#" suffix.

For now no javascript code transforms it into a real numbered list item
so you only get an empty value that isn't taken into account.

Files:

• CPS4/products/CPSSchemas/trunk/BasicFields.py (modified) (1 diff)
• CPS4/products/CPSSchemas/trunk/BasicWidgets.py (modified) (2 diffs)
• CPS4/products/CPSSchemas/trunk/CapsuleFields.py (modified) (1 diff)
• CPS4/products/CPSSchemas/trunk/CapsuleWidgets.py (modified) (6 diffs)
• CPS4/products/CPSSchemas/trunk/DataStructure.py (modified) (4 diffs)
• CPS4/products/CPSSchemas/trunk/Field.py (modified) (1 diff)
• CPS4/products/CPSSchemas/trunk/Layout.py (modified) (1 diff)
• CPS4/products/CPSSchemas/trunk/Widget.py (modified) (1 diff)
• CPS4/products/CPSSchemas/trunk/skins/cps_schemas/widget_capsulelist_render.pt (added)
• CPS4/products/CPSSchemas/trunk/tests/testCapsule.py (modified) (8 diffs)

CPS4/products/CPSSchemas/trunk/BasicFields.py

@@ -309 +309 @@
-
-    validation_error_msg = 'Not a string list: '
+
+    def getDefaultItem(self):
+        return u''
-
-    def verifyType(self, value):

CPS4/products/CPSSchemas/trunk/BasicWidgets.py

@@ -237 +237 @@
-        """Prepare datastructure from datamodel."""
-        datamodel = datastructure.getDataModel()
-
+
+
+
+
+
-
-    def _extractValue(self, value):
@@ -265 +269 @@
-        else:
-            datamodel = datastructure.getDataModel()
-
+
+
+
+
+
-
-        return not err

CPS4/products/CPSSchemas/trunk/CapsuleFields.py

@@ -78 +78 @@
-    def getDefault(self, datamodel=None):
-        return []
+
+    def getDefaultItem(self):
+        return self._field.getDefault()
-
-InitializeClass(CapsuleListField)

CPS4/products/CPSSchemas/trunk/CapsuleWidgets.py

@@ -190 +190 @@
-        """
-        datamodel = datastructure.getDataModel()
-
+
+
-        subdm = SubListItemDataModel(datamodel, values)
-        prefix = self.getWidgetId()+'_'
@@ -204 +205 @@
-                subds[sub_id+'_'+'__name__'] = value['__name__']
-            subwidget.prepare(subds, **kw)
+        # Also add a fake value for empty widgets in the datastructure
+        sub_id = prefix + '#'
+        subwidget = makeSubWidget(widget, sub_id)
+        field = datamodel._fields[field_id]
+        emptyvalue = [field.getDefaultItem()]
+        subdm = SubListItemDataModel(datamodel, emptyvalue)
+        subdm.setItemNumber(0)
+        subds = SubDataStructure(datastructure, subdm, '')
+        subwidget.prepare(subds, **kw)
-
-    def setWidgetInfo(self, infos, layout_mode, datastructure):
@@ -212 +222 @@
-        # Now also set widget infos for sub widgets
-        datamodel = datastructure.getDataModel()
-
+
+
-        subdm = SubListItemDataModel(datamodel, values)
-        prefix = self.getWidgetId()+'_'
@@ -223 +234 @@
-            subwidget = makeSubWidget(widget, sub_id)
-            subdm.setItemNumber(n)
+            subds = SubDataStructure(datastructure, subdm, '')
+            subwidget.setWidgetInfo(infos, layout_mode, subds)
+        if layout_mode == 'edit':
+            # We also make an empty widget for new entries
+            sub_id = prefix + '#'
+            subwidget = makeSubWidget(widget, sub_id)
+            field = datamodel._fields[field_id]
+            emptyvalue = [field.getDefaultItem()]
+            subdm = SubListItemDataModel(datamodel, emptyvalue)
+            subdm.setItemNumber(0)
-            subds = SubDataStructure(datastructure, subdm, '')
-            subwidget.setWidgetInfo(infos, layout_mode, subds)
@@ -281 +302 @@
-            if not widget.hidden_empty or rendered:
-                cells.append(cell)
+        if mode == 'edit':
+            # Add also a cell for the empty widget
+            sub_id = prefix + '#'
+            cell = {}
+            cell.update(widget_infos[sub_id])
+            widget_mode = cell['widget_mode']
+            subwidget = makeSubWidget(widget, sub_id)
+            rendered = subwidget.render(widget_mode, datastructure, **kw)
+            rendered = rendered.strip()
+            cell['widget_rendered'] = rendered
+            cell['empty_entry'] = True # Flag for the renderer
+            cells.append(cell)
+
-        render = self._getRenderMethod()
-        rendered = render(mode=mode, datastructure=datastructure,
@@ -418 +452 @@
-            last_modified = ''
-
-
-
-
-
-
-
-
-
-
-
+
-        content_url = None
-        ob = dm.getProxy()

CPS4/products/CPSSchemas/trunk/DataStructure.py

@@ -41 +41 @@
-_SESSION_DATASTRUCTURE_KEY = 'CPS_DATASTRUCTURE'
-
-
+|#
-
-class DataStructure(UserDict):
@@ -165 +165 @@
-                if not key.startswith(prefix):
-                    continue
-                del self[key]
-                suffix = key[len(prefix):]
-                m = _SUFFIX_RE.match(suffix)
@@ -171 +170 @@
-                    raise ValueError(key)
-                nn, rest = m.groups()
+                if nn == '#':
+                    # Part of "empty" entry prepared in datastructure, kept
+                    continue
+                del self[key]
-                n = int(nn)
-                if n >= length:
@@ -293 +296 @@
-        self._ds[self._prefix+key] = value
-
+    def __repr__(self):
+        return '<SubDataStructure prefix %r for %r>' % (
+            self._prefix, self._ds)

CPS4/products/CPSSchemas/trunk/Field.py

@@ -155 +155 @@
-        return self.default_expr_c(expr_context)
-
+    security.declarePrivate('getDefaultItem')
+    def getDefaultItem(self):
+       """Get a default value for a new item.
+
+        Used by Capsule List Widget rendering to prepare an "empty" item
+        widget for list-like fields.
+        """
+       raise NotImplementedError
+
-    def _createDefaultExpressionContext(self, datamodel):
-        """Create an expression context for default value evaluation."""

CPS4/products/CPSSchemas/trunk/Layout.py

@@ -307 +307 @@
-        Cells in a row have additionnal keys:
-         - widget
+         - widget_htmlid
-         - widget_mode
-         - widget_css_class

CPS4/products/CPSSchemas/trunk/Widget.py

@@ -369 +369 @@
-        infos[self.getWidgetId()] = {
-            'widget': self,
+            'widget_htmlid': self.getHtmlWidgetId(),
-            'widget_mode': mode,
-            'widget_css_class': css_class,

CPS4/products/CPSSchemas/trunk/tests/testCapsule.py

@@ -81 +81 @@
-        return getGlobalSchemaManager()
-
+class FakeMimeTypeRegistry(Acquisition.Implicit):
+    def lookupExtension(self, name):
+        return 'foo/bar'
-
-class IName(IObjectBase):
@@ -127 +130 @@
-        ctool = FakeCapsuleTool()
-        portal.portal_capsule = ctool
-utoo
-portal_url = utool
+portal.portal_ur
+mimetypes_registry = FakeMimeTypeRegistry()
-        return portal
-
@@ -233 +236 @@
-        layout.addWidget('fname', 'Capsule Object Widget', fields=[],
-                         layout_id='name') # for friends
-'?'
+
-        layout.addWidget('cities', 'Capsule List Widget', fields=['cities'],
-                         widget_id='city')
@@ -362 +365 @@
-                                    'bin_filename',
-                                  'name_first', 'name_last',
-
-
-
+ 'cities_#',
+ 'places_#',
+ 'havens_#',
-                                  'friends_0___name__',
-                                    'friends_0_first', 'friends_0_last',
+                                  'friends_#_first', 'friends_#_last',
-                                  'ref',
-                                  ]))
@@ -435 +439 @@
-                                  'name_first', 'name_last',
-                                  'cities_0', 'cities_1', 'cities_2',
-
+
+
+
-                                  'friends_0_first', 'friends_0_last',
-                                  'friends_1___name__',
-                                    'friends_1_first', 'friends_1_last',
+                                  'friends_#_first', 'friends_#_last',
-                                  'ref',
-                                  ]))
@@ -541 +548 @@
-        self.assert_('"Tokyo"' in cities_rendered)
-        self.assert_('"Paris"' in cities_rendered)
+        self.assert_('name="widget__cities_#:utf8:ustring"' in cities_rendered)
-        self.assert_('name="widget__cities_.:utf8:ustring"' in cities_rendered)
-
@@ -547 +555 @@
-        self.assert_('name="widget__places_0:utf8:ustring"' in places_rendered)
-        self.assert_('"Home"' in places_rendered)
+        self.assert_('name="widget__places_#:utf8:ustring"' in places_rendered)
-        self.assert_('name="widget__places_.:utf8:ustring"' in places_rendered)
-
-        havens_rendered = rows[6][0]['widget_rendered']
-        self.assert_(havens_rendered.startswith('mode edit|'))
+        self.assert_('name="widget__havens_#:utf8:ustring"' in havens_rendered)
-        self.assert_('name="widget__havens_.:utf8:ustring"' in havens_rendered)
-
@@ -567 +577 @@
-                     in friends_rendered)
-        self.assert_('"Connor"' in friends_rendered)
+        self.assert_('name="widget__friends_#_first:utf8:ustring"'
+                     in friends_rendered)
+        self.assert_('name="widget__friends_#_last:utf8:ustring"'
+                     in friends_rendered)
-        self.assert_('name="widget__friends_.:utf8:ustring"'
-                     in friends_rendered)