From 3debb1e0dce18b668546171a7ae40f7599e8ec79 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 3 Oct 2018 16:07:19 +0000 Subject: [PATCH] Bug 16231: Correct permission handling in subscription edit This patch corrects the way subscription edit menu items are displayed according to the user's permissions settings. To test, apply the patch and log in to the staff client as a user who has permission to create, edit, and delete subscriptions. - Locate an subscription and view the details for it. - Confirm that each "Edit" menu item works correctly. - Repeat the process when logged in as a user with varying combinations of create, edit, and delete permissions. - Test as a user limited by IndependentBranches. Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 7520ede89987a7a65301debdda46950a6364ebfd) Signed-off-by: Martin Renvoize (cherry picked from commit f2151c1bbc98003576606d8b1bd2cb2453e6925a) Signed-off-by: Lucas Gass --- .../prog/en/includes/serials-toolbar.inc | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 0c9109994d..900d30dfcf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -1,5 +1,6 @@ [% INCLUDE 'blocking_errors.inc' %] -[% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription || CAN_user_serials_receive_serials ) %] +[% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_receive_serials ) %] +
[% IF CAN_user_serials_create_subscription %] [% IF biblionumber_for_new_subscription %] @@ -14,25 +15,35 @@
[% END %] -- 2.20.1