From 8958853e5c29ce7d0057fb5cfcdaeb446c3b8bfc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 18 Oct 2018 17:37:35 -0300 Subject: [PATCH] Bug 21612: Remove incorrect GROUP BY's from Koha::VirtualShelves 'koha_kohadev.me.shelfname' isn't in GROUP BY Same as commit 7e220e0d8f107cce63f32bfaa1919c04b4dea6e2 Bug 20179: [sql_modes] Remove GROUP BY in get_shelves_containing_record Test plan: - Add public and privates shelves - Shares some of them - List them => The correct numbers of shelves must be displayed --- Koha/Virtualshelves.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Koha/Virtualshelves.pm b/Koha/Virtualshelves.pm index bb7db67789..d465ba8a7f 100644 --- a/Koha/Virtualshelves.pm +++ b/Koha/Virtualshelves.pm @@ -55,7 +55,7 @@ sub get_private_shelves { }, { join => [ 'virtualshelfshares' ], - group_by => 'shelfnumber', + distinct => 'shelfnumber', order_by => 'shelfname', ( ( $page and $rows ) ? ( page => $page, rows => $rows ) : () ), } @@ -73,7 +73,7 @@ sub get_public_shelves { category => 2, }, { - group_by => 'shelfnumber', + distinct => 'shelfnumber', order_by => 'shelfname', ( ( $page and $rows ) ? ( page => $page, rows => $rows ) : () ), } @@ -116,7 +116,7 @@ sub get_some_shelves { }, { join => [ 'virtualshelfshares' ], - group_by => 'shelfnumber', + distinct => 'shelfnumber', order_by => { -desc => 'lastmodified' }, } ); -- 2.11.0