Bug 23847: Fix custom item search fields if subfield is '0'

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / modules / catalogue / itemsearch.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 1d9e563..ee1b43e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -27,6 +27,7 @@
     [% CASE 'All statuses' %]<span>All statuses</span>
     [% CASE 'damaged' %]<span>Damaged</span>
     [% CASE 'itemlost' %]<span>Lost</span>
+    [% CASE 'withdrawn' %]<span>Withdrawn</span>
   [% END %]
 [% END %]
 
@@ -73,7 +74,7 @@
         <optgroup label="Custom search fields">
           [% FOREACH field IN items_search_fields %]
             [% marcfield = field.tagfield %]
-            [% IF field.tagsubfield %]
+            [% IF field.tagsubfield.defined AND field.tagsubfield != "" %]
               [% marcfield = marcfield _ '$' _ field.tagsubfield %]
             [% END %]
             <option value="marc:[% marcfield | html %]" data-authorised-values-category="[% field.authorised_values_category | html %]">[% field.label | html %] ([% marcfield | html %])</option>
@@ -158,6 +159,9 @@
             [% IF itemlosts.size %]
                 [% INCLUDE form_field_select name="itemlost" options = itemlosts empty_option = "All statuses" %]
             [% END %]
+            [% IF withdrawns.size %]
+                [% INCLUDE form_field_select name="withdrawn" options = withdrawns empty_option = "All statuses" %]
+            [% END %]
           </fieldset>
           <fieldset>
             [% INCLUDE form_field_select_text %]
@@ -275,6 +279,7 @@
                 + '      <th id="item_inventoryno">' + _("Inventory number") + '</th>'
                 + '      <th id="items_status">' + _("Not for loan status") + '</th>'
                 + '      <th id="items_itemlost">' + _("Lost status") + '</th>'
+                + '      <th id="items_widthdrawn">' + _("Withdrawn status") + '</th>'
                 + '      <th id="items_checkouts">' + _("Checkouts") + '</th>'
                 + '      <th id=""></th>'
                 + '    </tr>'
@@ -378,6 +383,7 @@
                     { 'sName': 'stocknumber' },
                     { 'sName': 'notforloan' },
                     { 'sName': 'itemlost' },
+                    { 'sName': 'withdrawn' },
                     { 'sName': 'issues' },
                     { 'sName': 'checkbox', 'bSortable': false }
                 ],
@@ -418,6 +424,11 @@
                     [% ELSE %]
                         null,
                     [% END %]
+                    [% IF withdrawns.size %]
+                        { 'type': 'select', 'values': [% INCLUDE escape_html_value_label elts => withdrawns %] },
+                    [% ELSE %]
+                        null,
+                    [% END %]
                     { 'type': 'text' },
                     null
                 ]
@@ -441,7 +452,7 @@
       form_field.append(button_field_new);
 
             // If a field is linked to an authorised values list, display the list.
-            $('div.form-field-select-text select').change(function() {
+            $('div.form-field-select-text select[name="f"]').change(function() {
                 loadAuthorisedValuesSelect($(this));
             }).change();
 
@@ -457,15 +468,16 @@
                         }
                     }
                 });
-                $('#itemsearchform').submit(function() {
-                  var searchform = $(this);
-                  var format = searchform.find('input[name="format"]:checked').val();
-                  if (format == 'html') {
+            });
+
+            $('#itemsearchform').submit(function() {
+                var searchform = $(this);
+                var format = searchform.find('input[name="format"]:checked').val();
+                if (format == 'html') {
                     submitForm(searchform);
                     $("#item-search-block").hide();
                     return false;
-                  }
-                });
+                }
             });
         });
     </script>