From a69b874ee64737c7bbd59aa739e981b3fe61a944 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 29 Nov 2017 15:24:40 -0300 Subject: [PATCH] Bug 19560: Correctly escape branchcode in admin/branches.pl Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit d9735ae0d8aff9ca405674df3d2b03183e0883b6) Signed-off-by: Fridolin Somers --- .../prog/en/modules/admin/branches.tt | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index fb2d723703..3ac936ce5c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -1,13 +1,13 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Libraries and groups [% IF op == 'editcategory' %] - ›[% IF category.categorycode %]Edit group [% category.categorycode%][% ELSE %]New group[% END %] + › [% IF category.categorycode %] Edit group [% category.categorycode%] [% ELSE %] New group [% END %] [% ELSIF op == 'delete_confirm_category' %] › Confirm deletion of group [% category.categorycode %] [% ELSIF op == 'add_form' %] - ›[% IF library %]Modify library[% ELSE %]New library [% library.branchcode %][% END %] + › [% IF library %] Modify library [% library.branchcode | html %] [% ELSE %] New library [% END %] [% ELSIF op == 'delete_confirm' %] - › Confirm deletion of library '[% library.branchcode %]' + › Confirm deletion of library '[% library.branchcode | html %]' [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -63,13 +63,13 @@ tinyMCE.init({ › AdministrationLibraries and groups [% IF op == 'add_form_category' %] -› [% IF category.categorycode %]Edit group [% category.categorycode %][% ELSE %]New group[% END %] +› [% IF category.categorycode %] Edit group [% category.categorycode %] [% ELSE %] New group [% END %] [% ELSIF op == 'delete_confirm_category' %] › Confirm deletion of group [% category.categorycode %] [% ELSIF op == 'add_form' %] -› [% IF library %]Modify library[% ELSE %]New library [% library.branchcode %][% END %] +› [% IF library %] Modify library [% library.branchcode | html %] [% ELSE %] New library [% END %] [% ELSIF op == 'delete_confirm' %] -› Confirm deletion of library '[% library.branchcode %]' +› Confirm deletion of library '[% library.branchcode | html %]' [% END %] @@ -143,7 +143,7 @@ tinyMCE.init({ [% IF library %] Library code: - [% library.branchcode %] + [% library.branchcode | html %] [% ELSE %] @@ -204,7 +204,7 @@ tinyMCE.init({ [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%]
-

Are you sure you want to delete [% library.branchname |html %] ([% library.branchcode %])?

+

Are you sure you want to delete [% library.branchname |html %] ([% library.branchcode | html %])?

@@ -269,8 +269,12 @@ tinyMCE.init({ [% library.branchip %] - Edit - Delete + Edit + + + + +
[% END %] -- 2.39.5