Merge lp:~methanal-developers/methanal/808487-modaldialog-liveform-actions into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/widgets.py'
--- methanal/widgets.py	2011-03-09 14:45:01 +0000
+++ methanal/widgets.py	2011-07-11 11:06:08 +0000
@@ -26,8 +26,8 @@
 from methanal.imethanal import IColumn
 from methanal.util import getArgsDict
 from methanal.view import (
-    liveFormFromAttributes, SimpleForm, FormInput, LiveForm, SubmitAction,
-    ActionButton, ActionContainer, SelectInput)
+    liveFormFromAttributes, SimpleForm, FormInput, LiveForm, ActionButton,
+    SelectInput)
 from methanal.model import Value
 from methanal.errors import InvalidIdentifier
 
@@ -628,14 +628,16 @@
 class ModalDialogForm(LiveForm):
     """
     L{methanal.view.LiveForm} for L{methanal.widgets.ModalDialog}.
+
+    @type addCancelAction: C{bool}
+    @ivar addCancelAction: Add the cancel action? Defaults to C{True}.
     """
     jsClass = u'Methanal.Widgets.ModalDialogForm'
 
-    def __init__(self, actions=None, **kw):
-        if actions is None:
-            actions = ActionContainer(
-                actions=[SubmitAction(name=u'OK'), CancelAction()])
-        super(ModalDialogForm, self).__init__(actions=actions, **kw)
+    def __init__(self, addCancelAction=True, **kw):
+        super(ModalDialogForm, self).__init__(**kw)
+        if addCancelAction:
+            self.actions.addAction(CancelAction())