From b313d7c98f6d753caa18cc572ec355f16c4367b1 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 26 Sep 2018 17:54:28 +0000
Subject: [PATCH] Bug 21418: Incorrectly filtered markup in staff client lists

This patch removes the "|html" filter from some variable declarations in
the template used to display the list of lists in the staff client.

To test you should have at least one list. Apply the patch and go to
Lists.

In the table of lists, the "Edit" and "Delete" buttons should look
correct and work correctly.

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

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../virtualshelves/tables/shelves_results.tt       | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
index 3cb77eda49..fde5544390 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
@@ -35,24 +35,24 @@
 [%~ SET action_block = '' ~%]
 [%~ IF can_manage_shelf OR can_delete_shelf ~%]
     [%~ IF can_manage_shelf ~%]
-        [%~ action_block =                '<form action="shelves.pl" method="get">' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="category" value="' _ type _ '" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' | html ~%]
+        [%~ action_block =                '<form action="shelves.pl" method="get">' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="category" value="' _ type _ '" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
         [%~ action_block = action_block _ '<button class="editshelf btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</button>' ~%]
-        [%~ action_block = action_block _ '</form> ' | html ~%]
+        [%~ action_block = action_block _ '</form> ' ~%]
     [%~ END ~%]
     [%~ IF can_manage_shelf OR can_delete_shelf ~%]
-        [%~ action_block = action_block _ ' <form action="shelves.pl" method="post">' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="shelfoff" value="' _ shelfoff _ '" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="shelves" value="1" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="op" value="delete" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="category" value="' _ type _ '" />' | html ~%]
-        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' | html ~%]
+        [%~ action_block = action_block _ ' <form action="shelves.pl" method="post">' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="shelfoff" value="' _ shelfoff _ '" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="shelves" value="1" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="op" value="delete" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="category" value="' _ type _ '" />' ~%]
+        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
         [%~ action_block = action_block _ '<button type="submit" class="deleteshelf btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button>' ~%]
-        [%~ action_block = action_block _ '</form>' | html ~%]
+        [%~ action_block = action_block _ '</form>' ~%]
     [%~ END ~%]
 [%~ ELSE ~%]
     [%~ SET action_block = 'None' ~%]
-- 
2.11.4.GIT