Bugzilla – Attachment 64294 Details for
Bug 18762
Some tests are noisy
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18762: Remove warnings from xt/author/valid-templates.t
Bug-18762-Remove-warnings-from-xtauthorvalid-templ.patch (text/plain), 6.39 KB, created by
Jonathan Druart
on 2017-06-14 17:08:50 UTC
(
hide
)
Description:
Bug 18762: Remove warnings from xt/author/valid-templates.t
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-06-14 17:08:50 UTC
Size:
6.39 KB
patch
obsolete
>From 513bdf796d775036a0c780ab43599d58dd446096 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 8 Jun 2017 15:35:02 -0300 >Subject: [PATCH] Bug 18762: Remove warnings from xt/author/valid-templates.t > >Test plan: >Read the changes and make sure they make sense > >Signed-off-by: Lee Jamison <ldjamison@marywood.edu> > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >index 21098f0ffd..1cbe84ffa8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >@@ -1,6 +1,6 @@ > [% USE Price %] > [% SET NoIssuesCharge = Koha.Preference('noissuescharge') %] >-[% IF fines > 0 %] >+[% IF fines and fines > 0 %] > <li> > <span class="circ-hlt">Fees & Charges:</span> > Patron has outstanding fees & charges of [% fines | $Price %]. >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 25a3d656ef..760e9d2a8e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -353,7 +353,7 @@ function delete_contact(ev) { > <p><strong>Discount: </strong> > [% discount | format("%.1f") %] %</p> > <p><strong>Tax rate: </strong> >- [% 0 + tax_rate * 100 %] %</p> >+ [% ( tax_rate || 0 ) * 100 %] %</p> > [% IF deliverytime.defined %] > <p><strong>Delivery time: </strong> > [% deliverytime %] days</p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index e1502325a2..d8d736acd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -90,7 +90,7 @@ function searchauthority() { > <h1>Authority #[% authid %] ([% authtypetext %])</h1> > > <div id="action"> >- [% IF count > 0 %] >+ [% IF count %] > Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&q=an=[% authid %]">[% count %] record(s)</a> > [% ELSE %] > This authority is not used in any records. >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 5905e3e281..3a70dad636 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -40,7 +40,7 @@ > <option value="!=" >is not</option> > [% END %] > </select> >- [% values = CGI.param(name) %] >+ [% SET values = CGI.param(name) %] > <select id="[% name %]" name="[% name %]" multiple="multiple" size="[% options.size < 4 ? options.size + 1 : 4 %]"> > [% IF (values == '') %] > <option value="" selected="selected"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index e035200138..fc212d95d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -129,7 +129,7 @@ $('#sort_by').change(function() { > [% END %] > param1 += "<\/optgroup>"; > [% END %] >- [% IF add_to_some_private_shelves.count > 10 or add_to_some_public_shelves.count > 10 %] >+ [% IF ( add_to_some_private_shelves and add_to_some_private_shelves.count > 10 ) or ( add_to_some_public_shelves and add_to_some_public_shelves.count > 10 ) %] > param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>"; > [% END %] > param1 +="<option value=\"newlist\">"+_("[ New list ]")+"<\/option>" >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >index fd85eda98d..0de567d864 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >@@ -46,7 +46,7 @@ > <h1>[% summary.mainentry %][% IF authtypetext %] ([% authtypetext %])[% END %]</h1> > > <div class="usedin"> >- [% IF count > 0 %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&q=[% authid %]&idx=an,phr">Number of records used in: [% count %]</a>[% ELSE %]This authority is not used in any records.[% END %] >+ [% IF count %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&q=[% authid %]&idx=an,phr">Number of records used in: [% count %]</a>[% ELSE %]This authority is not used in any records.[% END %] > </div> > > <div class="authstanza"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index b5e05b9f9d..528ace5309 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -780,7 +780,7 @@ $(document).ready(function(){ > [% END %] > param1 += "<\/optgroup>"; > [% END %] >- [% IF add_to_some_private_shelves.count > 10 or add_to_some_public_shelves.count > 10 %] >+ [% IF ( add_to_some_private_shelves and add_to_some_private_shelves.count > 10 ) or ( add_to_some_public_shelves and add_to_some_public_shelves.count > 10 ) %] > param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>"; > [% END %] > param1 +="<option value=\"newlist\">"+_("[ New list ]")+"<\/option>" >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18762
:
64114
|
64115
|
64116
|
64117
|
64170
|
64175
|
64232
|
64234
| 64294 |
64295
|
64296