Bugzilla – Attachment 46783 Details for
Bug 13618
Add additional template filter methods and a filter presence test to Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13618: Fix last occurrences recently introduced to master
Bug-13618-Fix-last-occurrences-recently-introduced.patch (text/plain), 7.28 KB, created by
Jonathan Druart
on 2016-01-18 11:20:07 UTC
(
hide
)
Description:
Bug 13618: Fix last occurrences recently introduced to master
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-01-18 11:20:07 UTC
Size:
7.28 KB
patch
obsolete
>From 69b77948ce24328b996fa6317f656e2aee8e0392 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 22 Oct 2015 09:06:55 +0100 >Subject: [PATCH] Bug 13618: Fix last occurrences recently introduced to master > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > .../intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++-- > 4 files changed, 8 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index d73348c..c09f87f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -129,7 +129,7 @@ $(document).ready(function() { > [% END %] > <td>[% checkout_info.barcode %]</td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.item.biblionumber %]&type=intra"><strong>[% checkout_info.item.title |html %][% FOREACH subtitl IN checkout_info.item.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF checkout_info.item.author %], by [% checkout_info.item.author %][% END %][% IF ( checkout_info.itme.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.item.biblionumber %]&itemnumber=[% checkout_info.item.itemnumber %]#item[% checkout_info.item.itemnumber %]">[% checkout_info.item.barcode %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.item.biblionumber %]&type=intra"><strong>[% checkout_info.item.title %][% FOREACH subtitl IN checkout_info.item.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF checkout_info.item.author %], by [% checkout_info.item.author %][% END %][% IF ( checkout_info.itme.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.item.biblionumber %]&itemnumber=[% checkout_info.item.itemnumber %]#item[% checkout_info.item.itemnumber %]">[% checkout_info.item.barcode %]</a> > </td> > <td> > [% IF checkout_info.NEEDSCONFIRMATION %] >@@ -255,7 +255,7 @@ $(document).ready(function() { > Too many checked out. > [% END %] > [% IF checkout_info.UNKNOWN_BARCODE %] >- <li>The barcode was not found [% checkout_info.barcode |html %] >+ <li>The barcode was not found [% checkout_info.barcode %] > [% END %] > [% IF checkout_info.DEBT %] > The patron has a debt of [% checkout_info.DEBT %] <!-- Need debt_confirmed --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index 58e1b0c..f6a75b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >@@ -392,11 +392,11 @@ > </li> > <li> > <label for="barcode_height_scale">Scale height (relative to card): </label> >- <input type="text" name="barcode_height_scale" id="barcode_height_scale" size="2" value="[% barcode_height_scale |html %]" /> >+ <input type="text" name="barcode_height_scale" id="barcode_height_scale" size="2" value="[% barcode_height_scale %]" /> > </li> > <li> > <label for="barcode_width_scale">Scale width (relative to card): </label> >- <input type="text" name="barcode_width_scale" id="barcode_width_scale" size="2" value="[% barcode_width_scale |html %]" /> >+ <input type="text" name="barcode_width_scale" id="barcode_width_scale" size="2" value="[% barcode_width_scale %]" /> > </li> > <li> > <label for="barcode_type">Barcode type: </label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index a7f847b..0f0a841 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -126,7 +126,7 @@ > <ol> > <li> > <label for="name" class="required">Name: </label> >- <input type="text" name="name" id="name" value="[% field.name | html %]" /> >+ <input type="text" name="name" id="name" value="[% field.name %]" /> > </li> > <li> > <label for="av">Authorised value category: </label> >@@ -143,7 +143,7 @@ > </li> > <li> > <label for="marcfield">Marc field: </label> >- <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield| html %]" /> >+ <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield %]" /> > </li> > <li> > <label for="searchable">Searchable: </label> >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 4f4a77d..0ecf018 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -755,7 +755,7 @@ $(document).ready(function(){ > [% SET number_of_private_shelves = 0 %] > [% FOREACH s IN add_to_some_private_shelves %] > [% IF shelfnumber != s.shelfnumber %] >- param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >+ param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>"; > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] > [% IF number_of_private_shelves == 10 %][% LAST %][% END %] > [% END %] >@@ -767,7 +767,7 @@ $(document).ready(function(){ > [% SET number_of_public_shelves = 0 %] > [% FOREACH s IN add_to_some_public_shelves %] > [% IF shelfnumber != s.shelfnumber %] >- param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >+ param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>"; > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] > [% IF number_of_public_shelves == 10 %][% LAST %][% END %] > [% END %] >-- >2.1.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 13618
:
35488
|
35516
|
40480
|
40481
|
40482
|
40483
|
40484
|
40485
|
40487
|
41346
|
41347
|
41348
|
41349
|
41350
|
41351
|
41352
|
41353
|
41354
|
41355
|
41746
|
41747
|
41776
|
42009
|
42054
|
42072
|
42073
|
42075
|
42078
|
42079
|
42087
|
42090
|
42091
|
42092
|
42093
|
42094
|
42095
|
42096
|
42097
|
45141
|
45784
|
45785
|
45788
|
46767
|
46768
|
46769
|
46770
|
46771
|
46772
|
46773
|
46774
|
46775
|
46776
|
46777
|
46778
|
46779
|
46780
|
46781
|
46782
|
46783
|
46784
|
46785
|
46786
|
46787
|
46788
|
46789
|
46790
|
46791
|
46792
|
46793
|
46794
|
46795
|
46796
|
46797
|
46798
|
46799
|
46800
|
46801
|
46802
|
46803
|
46804
|
46805
|
46806
|
46807
|
46808
|
46809
|
46810
|
46811
|
46812
|
46813
|
46814
|
46815
|
46816
|
46817
|
46818
|
46819
|
46820
|
46821
|
46822
|
47425
|
47426
|
47427
|
47428
|
47429
|
47430
|
47431
|
47432
|
47433
|
47434
|
47435
|
47436
|
47437
|
47438
|
47439
|
47440
|
47441
|
47442
|
47443
|
47444
|
47445
|
47446
|
47447
|
47448
|
47449
|
47450
|
47451
|
47452
|
47631
|
59983
|
59984
|
59987
|
77804
|
77805
|
77806
|
77807
|
77808
|
77809
|
77997
|
77998
|
78158
|
78274
|
78415
|
79404
|
79818
|
81183
|
83479
|
83480