From a72911d701f3ac4ff4f9e4cd2ed61287d2739156 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatetsolutions.com>
Date: Wed, 18 Apr 2018 10:41:08 -0400
Subject: [PATCH] Bug 9302: Use new 'edit borrowers' permission

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 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 @@
             <div id="searchheader">
               <h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember | html %]'[% END %]</span></h3>
             </div>
-            [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers %]
+            [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
               <div id="searchheader">
                   <div>
                     [% IF CAN_user_tools_manage_patron_lists %]
@@ -82,11 +82,11 @@
                       </span>
                     [% 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 %]
                           <button id="merge-patrons" type="submit">Merge selected patrons</button>
                     [% END %]
                   </div>
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.39.5