From 27a4149625252e4c28dc97df998d82fd6f2652b8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 21 Jan 2017 08:48:20 +0100 Subject: [PATCH] Bug 16115: Remove JS error on item search if NOT_LOAN values do not exist If NOT_LOAN is not present, the item search form will raise a JS error: SyntaxError: expected expression, got '}' This patch fixes it by handling this specific case. Note that the "Status" column is still displayed. Test plan: Remove your NOT_LOAN authorised values Go on the item search form => You will not get the JS error and the "Status" bloc is no longer displayed. There is no need to display it if empty. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall --- .../prog/en/modules/catalogue/itemsearch.tt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 ff0a930195..d2b0d7fb32 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -295,7 +295,11 @@ { 'type': 'select', 'values': [% branches.json %] }, { 'type': 'select', 'values': [% locations.json %] }, { 'type': 'text' }, - { 'type': 'select', 'values': [% notforloans.json %] }, + [% IF notforloans.size %] + { 'type': 'select', 'values': [% notforloans.json %] }, + [% ELSE %] + null, + [% END %] { 'type': 'text' }, null ] @@ -414,11 +418,13 @@ options = ccodes empty_option = "All collection codes" %] - [% INCLUDE form_field_select - name="notforloan" - options = notforloans - empty_option = "All statuses" - %] + [% IF notforloans.size %] + [% INCLUDE form_field_select + name="notforloan" + options = notforloans + empty_option = "All statuses" + %] + [% END %]
[% INCLUDE form_field_select_text_block %] -- 2.39.5