Bugzilla – Attachment 81183 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: Remove html filter for LAST
Bug-13618-Remove-html-filter-for-LAST.patch (text/plain), 8.74 KB, created by
Jonathan Druart
on 2018-10-25 16:09:43 UTC
(
hide
)
Description:
Bug 13618: Remove html filter for LAST
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-10-25 16:09:43 UTC
Size:
8.74 KB
patch
obsolete
>From 49888cabd851692cbf16c52fac74306a604e95a6 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 25 Oct 2018 12:56:38 -0300 >Subject: [PATCH] Bug 13618: Remove html filter for LAST > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++-- > t/lib/QA/TemplateFilters.pm | 1 + > 6 files changed, 10 insertions(+), 9 deletions(-) > >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 7024546f9e..ce5179f888 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -89,7 +89,7 @@ > <a href="#" class="addtolist" data-shelfnumber="[% s.shelfnumber | html %]">[% s.shelfname | html %]</a> > </li> > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] >- [% IF number_of_private_shelves == 10 %][% LAST | html %][% END %] >+ [% IF number_of_private_shelves == 10 %][% LAST %][% END %] > [% END %] > [% END %] > [% END %] >@@ -102,7 +102,7 @@ > <a href="#" data-shelfnumber="[% s.shelfnumber | html %]" class="addtolist">[% s.shelfname | html %]</a> > </li> > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] >- [% IF number_of_public_shelves == 10 %][% LAST | html %][% END %] >+ [% IF number_of_public_shelves == 10 %][% LAST %][% END %] > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >index 09371f6dab..018cdee0e4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >@@ -221,7 +221,7 @@ > [% value_manualinv = manualinv.authorised_value|truncate(5, '') | html %] > [% IF loopresul.accounttype == value_manualinv %] > <span>[% manualinv.authorised_value | html %]</span> >- [% LAST | html %] >+ [% LAST %] > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index b89db7687e..f1020c4050 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -560,7 +560,7 @@ > [% IF shelfnumber != s.shelfnumber %] > param1 += "<option id=\"s[% s.shelfnumber | html %]\" value=\"addtolist\">[% s.shelfname | html %]<\/option>"; > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] >- [% IF number_of_private_shelves == 10 %][% LAST | html %][% END %] >+ [% IF number_of_private_shelves == 10 %][% LAST %][% END %] > [% END %] > [% END %] > param1 += "<\/optgroup>"; >@@ -572,7 +572,7 @@ > [% IF shelfnumber != s.shelfnumber %] > param1 += "<option id=\"s[% s.shelfnumber | html %]\" value=\"addtolist\">[% s.shelfname | html %]<\/option>"; > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] >- [% IF number_of_public_shelves == 10 %][% LAST | html %][% END %] >+ [% IF number_of_public_shelves == 10 %][% LAST %][% END %] > [% END %] > [% END %] > param1 += "<\/optgroup>"; >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 11628178a4..e044d32bc4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -40,7 +40,7 @@ > [% FOREACH s IN some_public_shelves %] > <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]&sortfield=[% s.sortfield | html %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li> > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] >- [% IF number_of_public_shelves >= 10 %][% LAST | html %][% END %] >+ [% IF number_of_public_shelves >= 10 %][% LAST %][% END %] > [% END %] > [% IF some_public_shelves > 10 %] > <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=2" tabindex="-1" role="menuitem" class="listmenulink">View All</a></li> >@@ -57,7 +57,7 @@ > [% FOREACH s IN some_private_shelves %] > <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]&sortfield=[% s.sortfield | html %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li> > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] >- [% IF number_of_private_shelves >= 10 %][% LAST | html %][% END %] >+ [% IF number_of_private_shelves >= 10 %][% LAST %][% END %] > [% END %] > [% IF some_private_shelves > 10 %] > <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=1" tabindex="-1" role="menuitem" class="listmenulink">View All</a></li> >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 45733ea8eb..1d3742d839 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -765,7 +765,7 @@ $(document).ready(function(){ > [% IF shelfnumber != s.shelfnumber %] > param1 += "<option id=\"s[% s.shelfnumber | html %]\" value=\"addtolist\">[% s.shelfname | html %]<\/option>"; > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] >- [% IF number_of_private_shelves == 10 %][% LAST | html %][% END %] >+ [% IF number_of_private_shelves == 10 %][% LAST %][% END %] > [% END %] > [% END %] > param1 += "<\/optgroup>"; >@@ -777,7 +777,7 @@ $(document).ready(function(){ > [% IF shelfnumber != s.shelfnumber %] > param1 += "<option id=\"s[% s.shelfnumber | html %]\" value=\"addtolist\">[% s.shelfname | html %]<\/option>"; > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] >- [% IF number_of_public_shelves == 10 %][% LAST | html %][% END %] >+ [% IF number_of_public_shelves == 10 %][% LAST %][% END %] > [% END %] > [% END %] > param1 += "<\/optgroup>"; >diff --git a/t/lib/QA/TemplateFilters.pm b/t/lib/QA/TemplateFilters.pm >index 2aa94b7dfb..4fbd0503b8 100644 >--- a/t/lib/QA/TemplateFilters.pm >+++ b/t/lib/QA/TemplateFilters.pm >@@ -24,6 +24,7 @@ our @tt_directives = ( > qr{^\s*FILTER}, > qr{^\s*STOP}, > qr{^\s*NEXT}, >+ qr{^\s*LAST}, > ); > > sub missing_filters { >-- >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 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