Merge commit '2.13' into HEAD

[maypole.git] / lib / Maypole / templates / factory / search_form

diff --git a/lib/Maypole/templates/factory/search_form b/lib/Maypole/templates/factory/search_form
index d10101eae5550823965fc57d69bba57ed51556f2..5694f7d9dd6261b0a8fda3943d93dc2bb1908529 100644 (file)
--- a/lib/Maypole/templates/factory/search_form
+++ b/lib/Maypole/templates/factory/search_form
@@ -1,22 +1,20 @@
+
+<!-- ### Search component ### -->
+
 <div id="search">
-<form method="get" action="[% base %]/[% classmetadata.moniker %]/search/">
+<form method="get" action="[% base %]/[% classmetadata.moniker %]/do_search/">
 <fieldset>
 <legend>Search</legend>
-        [% FOR col = classmetadata.columns;
-            NEXT IF col == "id" OR col == classmetadata.table _ "_id";
-         %]
-           <label>
-                <span class="field">[% classmetadata.colnames.$col; %]</span>
-                    [% SET element = classmetadata.cgi.$col;
-                    IF element.tag == "select";
-                        USE element_maker = Class("HTML::Element");
-                        SET element = element.unshift_content(
-                            element_maker.new("option", value," "));
-                    END;
-                   element.as_XML; %]
-                  </label>
-        [% END; %]
-    <input type="submit" name="search" value="search"/>
-    </fieldset>
+[% USE search_class = Class request.model_class; %]
+[% FOR col = search_class.search_columns() %]
+  <label>
+     <span class="field">[% classmetadata.colnames.$col; %]</span>
+     [% SET element = classmetadata.cgi.$col; element.as_XML; %]
+  </label>
+[% END; %]
+<input type="submit" name="search" value="search"/>
+</fieldset>
 </form>
 </div>
+
+<!-- # Search end -->