[Checkins] SVN: zope3org/trunk/src/zorg/multiform/

Bernd Dorn bernd.dorn at fhv.at
Tue Apr 11 05:09:36 EDT 2006


Log message for revision 66836:
  

Changed:
  U   zope3org/trunk/src/zorg/multiform/gridform.txt
  U   zope3org/trunk/src/zorg/multiform/multiform.py

-=-
Modified: zope3org/trunk/src/zorg/multiform/gridform.txt
===================================================================
--- zope3org/trunk/src/zorg/multiform/gridform.txt	2006-04-11 09:00:02 UTC (rev 66835)
+++ zope3org/trunk/src/zorg/multiform/gridform.txt	2006-04-11 09:09:35 UTC (rev 66836)
@@ -52,6 +52,10 @@
     >>> def isSubFormDisplayMode(form,action):
     ...     return not form.inputMode
 
+    >>> def allSubFormsDisplayMode(form,action):
+    ...     return not (True in form.parentForm.subFormInputMode.values())
+
+
     >>> class OrderForm(gridform.GridItemFormBase):
     ...     inputMode=False
     ...     forceInput=['selected'] 
@@ -70,7 +74,7 @@
     ...         self.newInputMode = False
     ...         
     ...     @multiform.parentAction('Edit',
-    ...         condition=isSubFormDisplayMode)
+    ...         condition=allSubFormsDisplayMode)
     ...     def handle_edit_action(self, action, data):
     ...         if isSelected(self,action):
     ...             self.newInputMode = True

Modified: zope3org/trunk/src/zorg/multiform/multiform.py
===================================================================
--- zope3org/trunk/src/zorg/multiform/multiform.py	2006-04-11 09:00:02 UTC (rev 66835)
+++ zope3org/trunk/src/zorg/multiform/multiform.py	2006-04-11 09:09:35 UTC (rev 66836)
@@ -18,6 +18,7 @@
     return not isFormInputMode(f,action)
     
 def isFormInputMode(f,action):
+    return not f.inputMode
     if len(f.subFormInputMode) == 0:
         return f.inputMode
     else:
@@ -27,11 +28,7 @@
     return not isParentFormInputMode(f,action)
 
 def isParentFormInputMode(f,action):
-    parentForm = f.parentForm
-    if len(parentForm.subFormInputMode) == 0:
-        return parentForm.inputMode
-    else:
-        return (True in parentForm.subFormInputMode.values())
+    return (True in f.parentForm.subFormInputMode.values())
 
 
 class ItemAction(form.Action):



More information about the Checkins mailing list