Fix multi-action form.

[clinton/lisp-on-lines.git] / src / ucw / standard-components.lisp

diff --git a/src/ucw/standard-components.lisp b/src/ucw/standard-components.lisp
index dd39293..361e61e 100644 (file)
--- a/src/ucw/standard-components.lisp
+++ b/src/ucw/standard-components.lisp
@@ -23,18 +23,17 @@
 
 (defmethod ucw::find-action-id :around ((context standard-request-context))
   (or 
-   (let (id)
-     (ucw::find-parameter 
-      (context.request context) ucw::+action-parameter-name+
-      :test (lambda (name parameter)
-             (declare (ignore name))
-             (destructuring-bind (param-name &optional action-id)
-                 (split-sequence:split-sequence 
-                  +action-compound-name-delimiter+ parameter)
-               (when (and action-id 
-                          (string= ucw::+action-parameter-name+ param-name))
-                 (setf id action-id)))))
-     id)
+   (loop
+
+      :for (k . v) in (ucw::parameters 
+                     (context.request context))
+      :do(destructuring-bind (param-name &optional action-id)
+             (split-sequence:split-sequence 
+              +action-compound-name-delimiter+ k)
+           (when (and action-id 
+                      (string= 
+                       ucw::+action-parameter-name+ param-name))
+             (return action-id))))
    (call-next-method)))
 
 (defcomponent standard-window-component