Attachment 36436 Details for Bug 13787 – Bug 13787 - Clean up noisy opac-advsearch warnings

[patch] Bug 13787 - Clean up noisy opac-advsearch warnings

Bug-13787---Clean-up-noisy-opac-advsearch-warnings.patch (text/plain), 8.27 KB, created by Mark Tompsett on 2015-03-04 02:02:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2015-03-04 02:02:36 UTC

Size: 8.27 KB

patch

obsolete

>From 3e5a5dba04816a75d996b4ceab8021590df05980 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Tue, 3 Mar 2015 19:28:44 -0500
>Subject: [PATCH] Bug 13787 - Clean up noisy opac-advsearch warnings
>
>While testing bug 10937, there were noisy warnings, which
>distracted from testing the functionality of it.
>
>Here is a snippet of the after the patch warnings:
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 384.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
>Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
>
>Tweaking the [% IF %] statements eliminated the warnings.
>
>TEST PLAN
>---------
>1) Apply patch
>2) Run koha qa test tools.
>   -- there will be noisy warnings in the before processing, but
>      there will be no such messages in the after processing.
>3) git diff origin/master
>   -- there should be no visible typos.
>---
> .../bootstrap/en/modules/opac-advsearch.tt         | 23 ++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>index b985a76..bd946ce 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>@@ -112,7 +112,8 @@
>                     </div>
> 
>             <div class="row-fluid">
>-              [% 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 ) ) %]
>                 <div class="span12">
>                     <div id="advsearches" class="toptabs">
>                         <ul>
>@@ -146,7 +147,8 @@
>               [% END %]
> 
>                 <div class="row-fluid">
>-                  [% 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 ) ) %]
>                     <div class="span3">
>                         <div id="pubrange">
>                             
>@@ -161,7 +163,8 @@
>                     </div>
>                   [% 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 ) ) %]
>                     <div class="span3">
>                         <div id="langfilter">
>                             <fieldset>
>@@ -186,7 +189,8 @@
>                     </div> 
>                   [% 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 ) %]
>                         <div class="span3">
>                             
>@@ -224,7 +228,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 ) ) %]
>                     <div class="span3">
>                     
>                         <div id="sortby">
>@@ -241,7 +246,8 @@
>                   [% END %]
>                 </div> 
> 
>-                [% 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 ) ) %]
>                     <div class="row-fluid">
>                         [% IF ( usmarc ) %]
>                             
>@@ -341,7 +347,8 @@
>                 [% END # / IF expanded_options %]
>             </div> 
> 
>-        [% 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 ) %]
>             <div class="row-fluid">
>                 <div class="span12">
>                     <div class="text-center">
>@@ -360,7 +367,7 @@
>     <p>
>         <input class="btn btn-success" type="submit" accesskey="s" name="do" title="Search" value="Search" />
> 
>-        [% IF OpacAdvSearchMoreOptions.size > 0 %]
>+        [% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 ) %]
>             [% IF expanded_options %]
>                 <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0" class="btn btn-default more-less-options">Fewer options</a>
>             [% ELSIF not expanded_options %]
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 13787: 36436 | 36557 | 36610