Bug 13618: Remove html filter for LAST

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

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 7024546..ce5179f 100644 (file)
--- 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 09371f6..018cdee 100644 (file)
--- 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 b89db76..f1020c4 100644 (file)
--- 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 1162817..e044d32 100644 (file)
--- 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&amp;shelfnumber=[% s.shelfnumber | html %]&amp;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&amp;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&amp;shelfnumber=[% s.shelfnumber | html %]&amp;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&amp;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 45733ea..1d3742d 100644 (file)
--- 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 2aa94b7..4fbd050 100644 (file)
--- 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 {