From 172fed8521f939480d00a68bb620a5e634b13022 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 7 Nov 2018 01:32:26 +0000 Subject: [PATCH] Bug 21778: Sort user list by surname,firstname unless user cannot manage patron lists OR edit patrons To test: 1 - Create four users: 1 superlibrarian (or with both edit patrons and manage patron lists) 1 with only edit patrons and catalogue 1 with only add to list and catalogue 1 with catalogue but neither edit patrons or manage patron lists 2 - Search patrons signed in as each user 3 - Note different sorting 4 - Apply patch 5 - Try searching with each patron 6 - Results should always be sorted by surname, firstname 7 - Only in the case of neither extra permission should the checkboxes be absent Signed-off-by: Devinim Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 96b3889390f8efe9851aaa9c2cafa9e20bda3f43) Signed-off-by: Martin Renvoize (cherry picked from commit f228847155bc46433cbad4f834c2df89734b9c5c) Signed-off-by: Jesse Maseto (cherry picked from commit f0b6ec9e3934badb1a9b6c8a165a3a4012d83186) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2602e3f913..82ec8b230b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -246,7 +246,7 @@ $(document).ready(function() { }, 'bFilter': false, 'bAutoWidth': false, - [% IF CAN_user_tools_manage_patron_lists %] + [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %] 'aaSorting': [[2, 'asc']], [% ELSE %] 'aaSorting': [[1, 'asc']], -- 2.39.5