merge pool category branch; fixes #1521

2013-05-26 08:23:46 -04:00
parent 240b160b8a 1ee492c97b
commit ce39e45594
8 changed files with 53 additions and 7 deletions
--- a/app/views/pools/_search.html.erb
+++ b/app/views/pools/_search.html.erb
@@ -28,6 +28,15 @@
        </td>
      </tr>

+      <tr>
+        <th><label for="search_category">Category</th>
+        <td>
+          <div class="input">
+            <%= select "search", "category", [["Series", "series"], ["Collection", "collection"]], :selected => params[:search][:category], :include_blank => true %>
+          </div>
+        </td>
+      </tr>
+
      <tr>
        <th><label for="search_sort">Order</th>
        <td>