From 77a8b48c039e6814132c69fa0f74902e9e0edab7 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Wed, 3 Oct 2018 15:41:59 +0200
Subject: [PATCH] Revert "Bug 21353: Display checkboxes to merge patron even if
 cannot manage lists"

This reverts commit 63ab79d6e478d42f13ac48f62828a1059dff1aad.
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt   | 6 +++---
 .../prog/en/modules/members/tables/members_results.tt       | 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 36670e7e18..2602e3f913 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -162,7 +162,7 @@ $(document).ready(function() {
 
     // Apply DataTables on the results table
     var columns_settings = [% ColumnsSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ) %];
-    [% UNLESS CAN_user_borrowers_edit_borrowers OR CAN_user_tools_manage_patron_lists %]
+    [% UNLESS CAN_user_tools_manage_patron_lists %]
         [%# Remove the first column if we do not display the checkbox %]
         columns_settings.splice(0, 1);
     [% END %]
@@ -224,7 +224,7 @@ $(document).ready(function() {
             });
         },
         'aoColumns':[
-            [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %]
+            [% IF CAN_user_tools_manage_patron_lists %]
               { 'mDataProp': 'dt_borrowernumber', 'bSortable': false },
             [% END %]
             { 'mDataProp': 'dt_cardnumber' },
@@ -392,7 +392,7 @@ function filterByFirstLetterSurname(letter) {
             <table id="memberresultst">
               <thead>
                 <tr>
-                [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %]
+                [% IF CAN_user_tools_manage_patron_lists %]
                   <th>&nbsp;</th>
                 [% END %]
                   <th>Card</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
index ad391d631c..666b59c7f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
@@ -9,7 +9,7 @@
     "aaData": [
         [% FOREACH data IN aaData %]
             {
-                [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %]
+                [% IF CAN_user_tools_manage_patron_lists %]
                 "dt_borrowernumber":
                     "<input type='checkbox' class='selection' name='borrowernumber' value='[% data.borrowernumber %]' />",
                 [% END %]
-- 
2.39.5