@@ -, +, @@ --------- -- there will be noisy warnings in the before processing, but there will be no such messages in the after processing. -- there should be no visible typos. - Applied the patch from bug 10937 - Ran "koha-qa.pl -c 1" and observed the warnings described in the commit message - Applied the patch from this bug - Ran "koha-qa.pl -c 1" again and saw no warnings - Ran "koha-qa.pl -c 2" and saw no warnings --- .../bootstrap/en/modules/opac-advsearch.tt | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -111,7 +111,8 @@
- [% IF ( ( OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or + ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %]
    @@ -145,7 +146,8 @@ [% END %]
    - [% IF ( ( OpacAdvSearchOptions.grep('pubdate').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions.grep('pubdate').size > 0 and expanded_options ) ) %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('pubdate').size > 0 and not expanded_options ) or + ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('pubdate').size > 0 and expanded_options ) ) %]
    @@ -160,7 +162,8 @@
    [% END %] - [% IF ( ( OpacAdvSearchOptions.grep('language').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions.grep('language').size > 0 and expanded_options ) ) %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('language').size > 0 and not expanded_options ) or + ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('language').size > 0 and expanded_options ) ) %]
    @@ -185,7 +188,8 @@
    [% END %] - [% IF ( ( OpacAdvSearchOptions.grep('location').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions.grep('location').size > 0 and expanded_options ) ) %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('location').size > 0 and not expanded_options ) or + ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('location').size > 0 and expanded_options ) ) %] [% UNLESS ( singleBranchMode ) %]
    @@ -223,7 +227,8 @@ [% END # / UNLESS singleBranchMode %] [% END %] - [% IF ( ( OpacAdvSearchOptions.grep('sorting').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions.grep('sorting').size > 0 and expanded_options ) ) %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('sorting').size > 0 and not expanded_options ) or + ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('sorting').size > 0 and expanded_options ) ) %]
    @@ -240,7 +245,8 @@ [% END %]
    - [% IF ( ( OpacAdvSearchOptions.grep('subtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions.grep('subtype').size > 0 and expanded_options ) ) %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('subtype').size > 0 and not expanded_options ) or + ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('subtype').size > 0 and expanded_options ) ) %]
    [% IF ( usmarc ) %] @@ -340,7 +346,8 @@ [% END # / IF expanded_options %]
    - [% IF ( OpacAdvSearchMoreOptions.size > 0 and expanded_options ) or ( OpacAdvSearchOptions.size > 0 and not expanded_options ) %] + [% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 and expanded_options ) or + ( OpacAdvSearchOptions and OpacAdvSearchOptions.size > 0 and not expanded_options ) %]
    @@ -359,7 +366,7 @@

    - [% IF OpacAdvSearchMoreOptions.size > 0 %] + [% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 ) %] [% IF expanded_options %] Fewer options [% ELSIF not expanded_options %] --