From d2454d6868c357ee65dd683d80ab16f2cc2366fc 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 Signed-off-by: Jonathan Druart --- 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 0c731b5a00..74a83f6ee7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -66,7 +66,7 @@
  • Manage API keys
  • [% 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 7354fcef66..3469b9e1d9 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.39.5