From b2d7b3a89814c3acb1fd23e98f1ce566bc450a2c Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Sat, 28 May 2011 10:01:43 -0400
Subject: [PATCH] Format selector improvements

Consistent with format icon fall-thru, try mattype first to locate the
list of formats for search selection.  If no mattype configuration is
found, fall through to item_type.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 .../default/opac/parts/advanced/search.tt2         |  2 +-
 .../default/opac/parts/coded_value_selector.tt2    | 33 +++++++++++++++-------
 .../web/templates/default/opac/parts/searchbar.tt2 |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2 b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
index 9f1c94958e..788b57168f 100644
--- a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
@@ -32,7 +32,7 @@
             <td valign='top'>
                 <strong>[% l("Item Type") %]</strong><br />
                 [%  INCLUDE "default/opac/parts/coded_value_selector.tt2"
-                        attr="mattype" multiple="multiple" size="4"
+                        attr=["mattype", "item_type"] multiple="multiple" size="4"
                         id="adv_global_item_type_basic" %]
             </td>
             <td valign='top'>
diff --git a/Open-ILS/web/templates/default/opac/parts/coded_value_selector.tt2 b/Open-ILS/web/templates/default/opac/parts/coded_value_selector.tt2
index cfcd9a054e..92a96eea22 100644
--- a/Open-ILS/web/templates/default/opac/parts/coded_value_selector.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/coded_value_selector.tt2
@@ -1,15 +1,28 @@
-[%- name = name || "fi:" _ attr;
-    id = id || attr _ "_selector";
-    values = values || CGI.param(name); -%]
+
+[%- 
+    # If caller passes a list of possible attribute types, 
+    # search all until we find some values
+
+    IF !attr.size; attr = [attr]; END;
+    all_values = [];
+    attr_class = '';
+    FOR attr_class IN attr;
+        all_values = ctx.search_ccvm('ctype', attr_class);
+        IF all_values.size > 0; LAST; END;
+    END;
+    name = name || "fi:" _ attr_class;
+    id = id || attr_class _ "_selector";
+    values = values || CGI.param(name); 
+-%]
+
 <select id='[% id %]' name='[% name %]'[%
     multiple ? ' multiple="multiple"' : '';
     size ? (' size="' _ size _ '"') : ''; %]>
-[%  all_values = ctx.search_ccvm('ctype', attr);
-IF none_ok %]
+[% IF none_ok %]
     <option value=''>[% l('-- Any --') %]</option>
-[% END;
-FOR o IN all_values;
-   |l(o.value) %]
-    <option value='[% o.code %]'[% values.grep('^' _ o.code _ '$').size ? ' selected="selected"' : '' %]>[_1]</option>
-[%  END; END -%]
+[% END %]
+[% FOR o IN all_values %]
+    <option value='[% o.code %]'[% values.grep('^' _ o.code _ '$').size ? ' selected="selected"' : '' %]>[% o.value %]</option>
+[%  END -%]
 </select>
+
diff --git a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
index a38259f543..433ce68a27 100644
--- a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
@@ -48,7 +48,7 @@
         [% UNLESS is_advanced %]
         <tr>
             <td>
-                [% INCLUDE "default/opac/parts/coded_value_selector.tt2" attr="mattype" none_ok=1 %]
+                [% INCLUDE "default/opac/parts/coded_value_selector.tt2" attr=["mattype", "item_type"] none_ok=1 %]
             </td>
             <td>
                 <span id='depth_selector_span'>
-- 
2.11.0