[Checkins] SVN: z3c.multiform/Sandbox/src/z3c/multiform/multiform.py merge local and repository content

Stefan Martin s.martin at iwm-kmrc.de
Thu Mar 22 08:32:02 EDT 2007


Log message for revision 73438:
  merge local and repository content

Changed:
  U   z3c.multiform/Sandbox/src/z3c/multiform/multiform.py

-=-
Modified: z3c.multiform/Sandbox/src/z3c/multiform/multiform.py
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/multiform.py	2007-03-22 12:28:16 UTC (rev 73437)
+++ z3c.multiform/Sandbox/src/z3c/multiform/multiform.py	2007-03-22 12:32:01 UTC (rev 73438)
@@ -221,8 +221,8 @@
     parentForm = None
     inputMode = None
     newInputMode = None
-#    form_fields=[]
-#    actions = []
+    form_fields=[]
+    actions = []
     
     def __init__(self, context, request, parentForm):
         # we have to copy the default fields, so that we can mutate
@@ -272,7 +272,7 @@
     itemFormFactory = ItemFormBase
 
     forms = []
-    subForms = {}
+    subForms= {}
     subActionNames = []
     subFormInputMode = {}
 
@@ -288,13 +288,11 @@
         super(MultiFormBase,self).setUpWidgets(ignore_request=ignore_request)
         self.setUpItems()
 
-    def setUpItem(self, name, item, inputMode=None):
+    def setUpItem(self, name, item, inputMode):
         prefix = self.prefix + '.sf.' + name
         subForm = self.newSubForm(item)
-        if inputMode is None:
-            inputMode = subForm.inputMode
         if inputMode is not None and not inputMode:
-            forceInput = subForm.forceInput
+            forceInput = self.itemFormFactory.forceInput
             for field in subForm.form_fields:
                 if field.__name__ not in forceInput:
                     field.for_display=True
@@ -307,7 +305,7 @@
         self.subForms = {}
         for key, item in self.filter.items():
             self.forms.append(key)
-            inputMode = self.subFormInputMode.get(key, None)
+            inputMode = self.subFormInputMode.get(key, self.itemFormFactory.inputMode)
             self.setUpItem(key, item, inputMode)
         self.refreshSubActionNames()
 



More information about the Checkins mailing list