[Checkins] SVN: z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/ simplify

Laurent Mignon Laurent.Mignon at softwareag.com
Fri Feb 27 12:40:49 EST 2009


Log message for revision 97357:
  simplify

Changed:
  U   z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.py
  U   z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.zcml
  U   z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/testing.py

-=-
Modified: z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.py
===================================================================
--- z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.py	2009-02-27 14:44:59 UTC (rev 97356)
+++ z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.py	2009-02-27 17:40:48 UTC (rev 97357)
@@ -130,6 +130,7 @@
 
     xtype = 'timefield'
 
+
 class NumberField(TextField):
     zope.interface.implements(interfaces.IExtJSComponent)
     zope.component.adapts(
@@ -443,16 +444,8 @@
                         absoluteURL(self.form, self.form.request), name)
         if hasattr(self.form, 'ownerCt'):
             config['ownerCt'] = self.form.ownerCt
+        if hasattr(self.form, 'groups'):
+            items = config.get("items", [])
+            items += getGroupsConfig(self.form, json)
+            config['items'] = items
         return config
-
-
-class ExtGroupFormPanel(ExtFormPanel):
-    zope.interface.implements(interfaces.IExtJSComponent)
-    zope.component.adapts(interfaces.IExtJSGroupForm)
-
-    def _getConfig(self, json=False):
-        config = super(ExtGroupFormPanel, self)._getConfig()
-        items = config.get("items", [])
-        items += getGroupsConfig(self.form, json)
-        config['items'] = items
-        return config

Modified: z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.zcml
===================================================================
--- z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.zcml	2009-02-27 14:44:59 UTC (rev 97356)
+++ z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/component.zcml	2009-02-27 17:40:48 UTC (rev 97357)
@@ -17,10 +17,9 @@
       factory=".component.ExtFormPanel"
       />
   <adapter
-      factory=".component.ExtGroupFormPanel"
+      factory=".component.SimpleFiedWidgetFactory"
       />
 
-
   <!-- Adapt TextWidget -->
   <adapter
       factory=".component.TextField"

Modified: z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/testing.py
===================================================================
--- z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/testing.py	2009-02-27 14:44:59 UTC (rev 97356)
+++ z3c.formext/branches/sagblmi-morecomponent/src/z3c/formext/testing.py	2009-02-27 17:40:48 UTC (rev 97357)
@@ -108,7 +108,6 @@
     zope.component.provideAdapter(component.GroupPanel)
     zope.component.provideAdapter(component.FormPanel)
     zope.component.provideAdapter(component.ExtFormPanel)
-    zope.component.provideAdapter(component.ExtGroupFormPanel)
     zope.component.provideAdapter(component.Button)
     zope.component.provideAdapter(component.ClientButton)
     zope.component.provideAdapter(form.ClientButtonAction,



More information about the Checkins mailing list