From b46c8b8698b417ed6aa596d1cd567817b9bf753a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 13 Jul 2015 17:53:06 +0100 Subject: [PATCH] [SIGNED OFF] Bug 14529: Allow user to delete lists Bug 13417 allows a librarian to delete any lists if he has the permission (delete_public_lists). There is a mismatch in the perm check. A user can delete a list with the ability to edit (manage) it. Test plan: 1/ Create a list A with user A 2/ Create a list B with user B 3/ A should be able to manage and delete the list A. He cans delete B only if he is superlibrarian or has the delete_public_lists permission. Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/virtualshelves/tables/shelves_results.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 65a7459..01ceb8a 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 @@ -28,8 +28,8 @@ } [% BLOCK action_form -%] - [%- IF can_manage_shelf -%] -
[% IF can_manage_shelf OR can_delete_shelf %]
[% IF type == 1 %][% ELSE %][% END %]
[% END %] + [%- IF can_manage_shelf OR can_delete_shelf-%] +[% IF can_manage_shelf %]
[% END %][% IF can_manage_shelf OR can_delete_shelf %]
[% IF type == 1 %][% ELSE %][% END %]
[% END %] [%- ELSE -%] None [%- END -%] -- 2.5.0