From de2793568043bf449d1c3781cf8c5747640a5e86 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 25 Nov 2015 17:08:43 +0000 Subject: [PATCH] [PASSED QA] Bug 15256: Fix items table display on the detail page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug 14966 fixed a bug but introduced another one: With IndependentBranches set to 'prevent', if the librarian (without the superlibrarian permission) can edit items but not all, the table is broken. DataTables raises the following warning: "DataTables warning: table id=DataTables_Table_1 - Requested unknown parameter '8' for row0." And does not display correctly. Test plan: 1/ Create a biblio record with 1+ items located in different places. 2/ Create/use a patron with the permission to edit items 3/ Set the IndependentBranches pref to 'prevent' 4/ With this patron logged in, go on the record detail page. Without this patch, the display is broken (only 1 edit link and 1 td missing, DataTables raises a warning). With this patch, the display is correct. Signed-off-by: Frédéric Demians See the warning, and the broken table. Solved by this patch. Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index f9a1d35..f2fb6e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -807,8 +807,12 @@ function verify_images() { [% END %] [% END %] - [% IF CAN_user_editcatalogue_edit_items and not item.cannot_be_edited %] - Edit + [% IF CAN_user_editcatalogue_edit_items %] + + [% UNLESS item.cannot_be_edited %] + Edit + [% END %] + [% END %] [% END %] -- 1.9.1