[feature] WFormBuidler: Support for multiple file-upload fields.

MLstate · Jul 25, 2011 · 3b9421e · 3b9421e
1 parent 434495f
commit 3b9421e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/stdlib/widgets/formbuilder/formbuilder.opa b/stdlib/widgets/formbuilder/formbuilder.opa
@@ -404,21 +404,18 @@ WFormBuilder =
     | ~{ fragment } -> fragment
     | ~{ field } -> mk_field(field)
     body_form = <>{List.map(mk_element, spec.elts)}</>
-    match upload_fields_no(spec) with
-    | 0 ->
-        <form id={spec.form_id} action="#" onsubmit={_ -> process({SimpleForm})}
-          method="get" options:onsubmit="prevent_default">
-          {body_form}
-        </form>
-    | 1 ->
-        process(data) =
-          do Scheduler.push( -> process({FileUploadForm=data}))
-          void
-        config = {Upload.default_config() with
-                    ~body_form ~process form_id=spec.form_id}
-        Upload.html(config)
-    | _ ->
-        @todo //("WFormBuilder: forms with more than 1 upload fields are not (yet) supported")
+    if upload_fields_no(spec) == 0 then
+      <form id={spec.form_id} action="#" onsubmit={_ -> process({SimpleForm})}
+        method="get" options:onsubmit="prevent_default">
+        {body_form}
+      </form>
+    else
+      process(data) =
+        do Scheduler.push( -> process({FileUploadForm=data}))
+        void
+      config = {Upload.default_config() with
+                  ~body_form ~process form_id=spec.form_id}
+      Upload.html(config)
 
   start(spec : WFormBuilder.specification) : void =
     is_field =

diff --git a/stdlib/widgets/formbuilder/formbuilder_template_engine.opa b/stdlib/widgets/formbuilder/formbuilder_template_engine.opa
@@ -64,11 +64,12 @@ FormBuilderTemplate =
     | {some=fb_tag} ->
         match fb_tag with
         | {form} ->
-          fields = [] // FIXME
-          process(_) = @todo
-          spec = FB.create_specification(Dom.fresh_id(), fields)
-          form = FB.html(spec, process)
-          {success = form}
+            // FIXME
+            fields = []
+            process(_) = void
+            spec = FB.create_specification(Dom.fresh_id(), fields)
+            form = FB.html(spec, process)
+            {success = form}
 
   engine : Template.engine =
     { Template.empty with ~parse ~export }