From cc2f670a41216059a6952ae25f629a9e85a5cc29 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 8 May 2018 16:15:54 -0300 Subject: [PATCH] Bug 20568: Fix bad resolution conflict with bug 18403 borrowers module permission has now several subpermissions --- koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 2 +- members/apikeys.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 4ae0e671f0..9b5524d4c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -68,7 +68,7 @@ [% END %] [% END %] - [% IF ( CAN_user_borrowers ) %] + [% IF CAN_user_borrowers_edit_borrowers %] [% IF ( NorwegianPatronDBEnable == 1 ) %]
  • Delete local
  • Delete remote
  • diff --git a/members/apikeys.pl b/members/apikeys.pl index 77c4ce87a5..87979455c7 100755 --- a/members/apikeys.pl +++ b/members/apikeys.pl @@ -35,7 +35,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $cgi, type => 'intranet', authnotrequired => 0, - flagsrequired => { borrowers => 1 }, + flagsrequired => { borrowers => 'edit_borrowers' }, } ); -- 2.11.0