From e26869a350dd21ebbc0df054f3e9049cfbae1f33 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 18 Apr 2018 10:41:08 -0400 Subject: [PATCH] Bug 9302: Use new 'edit borrowers' permission --- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 6 +++--- members/merge-patrons.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index a52160ac73..fb62cb9132 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -53,7 +53,7 @@

Patrons found for: [% IF searchmember %] for '[% searchmember | html %]'[% END %]

- [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers %] + [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
[% IF CAN_user_tools_manage_patron_lists %] @@ -82,11 +82,11 @@ [% END %] - [% IF CAN_user_tools_manage_patron_lists && CAN_user_borrowers %] + [% IF CAN_user_tools_manage_patron_lists && CAN_user_borrowers_edit_borrowers %] | [% END %] - [% IF CAN_user_borrowers %] + [% IF CAN_user_borrowers_edit_borrowers %] [% END %]
diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl index 2008fd4917..b55db88bb6 100755 --- a/members/merge-patrons.pl +++ b/members/merge-patrons.pl @@ -34,7 +34,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( query => $cgi, type => "intranet", authnotrequired => 0, - flagsrequired => { borrowers => 1 } + flagsrequired => { borrowers => 'edit_borrowers' }, } ); -- 2.15.1 (Apple Git-101)