Merge lp:~methanal-developers/methanal/759805-form-action-ids into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2011-04-11 09:19:48 +0000
+++ methanal/js/Methanal/View.js	2011-04-13 14:08:23 +0000
@@ -5,6 +5,13 @@
 
 
 /**
+ * An unknown identifier was used.
+ */
+Divmod.Error.subclass(Methanal.View, 'UnknownIdentifier');
+
+
+
+/**
  * Build a mapping of input node values to DOM nodes.
  */
 Methanal.View.buildInputNodeMapping = function buildInputNodeMapping(node) {
@@ -829,12 +836,16 @@
  *
  * @type throbber: L{Methanal.Util.Throbber}
  * @ivar throbber: Action throbber
+ *
+ * @ivar _actionMapping: Mapping of L{FormAction} identifiers to
+ *     L{FormAction}s.
  */
 Nevow.Athena.Widget.subclass(Methanal.View, 'ActionContainer').methods(
     function __init__(self, node, args) {
         Methanal.View.ActionContainer.upcall(self, '__init__', node);
         self._disabled = false;
         self.actionIDs = args.actionIDs;
+        self._actionMapping = {};
     },
 
 
@@ -861,11 +872,24 @@
      */
     function loadedUp(self, action) {
         delete self.actionIDs[action.actionID];
+        self._actionMapping[action.actionID] = action;
         self._finishLoading();
     },
 
 
     /**
+     * Get a L{Methanal.View.FormAction} by identifier.
+     */
+    function getAction(self, actionID) {
+        var action = self._actionMapping[actionID];
+        if (action === undefined) {
+            throw Methanal.View.UnknownIdentifier(actionID);
+        }
+        return action;
+    },
+
+
+    /**
      * Enable all form actions.
      *
      * Actions for view-only forms cannot be enabled.

=== modified file 'methanal/view.py'
--- methanal/view.py	2011-03-31 10:35:52 +0000
+++ methanal/view.py	2011-04-13 14:08:23 +0000
@@ -43,14 +43,19 @@
     """
     defaultName = None
     allowViewOnly = False
-
-
-    def __init__(self, name=None, **kw):
+    identifier = None
+
+
+    def __init__(self, name=None, identifier=None, **kw):
         super(FormAction, self).__init__(**kw)
         if not name:
             name = self.defaultName
+        if identifier is None:
+            identifier = self.identifier
+            if identifier is None:
+                identifier = unicode(id(self))
         self.name = name
-        self.id = unicode(id(self))
+        self.id = identifier
 
 
     def getInitialArguments(self):
@@ -88,6 +93,7 @@
     jsClass = u'Methanal.View.SubmitAction'
     defaultName = u'Submit'
     type = 'submit'
+    identifier = u'submit'
 
 
 
@@ -99,6 +105,7 @@
     allowViewOnly = True
     defaultName = u'Reset'
     type = 'reset'
+    identifier = u'reset'