From d07df17bd5358a8eee4de92f5917fe51e8f8e973 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 20 Aug 2012 10:59:26 -0400 Subject: [PATCH] Bug 8657 - Default sort by call number does not work If you choose to sort search results in the OPAC or staff client by call number by default, the wrong value will be saved by the system preferences editor. It should be "call_number" instead of "callnumber." This patch corrects the pref file and updates the database in cases where defaultSortField or OPACdefaultSortField are set to the incorrect value for call number sort. To test: Set defaultSortField and/or OPACdefaultSortField to "call number" and perform a search. Results will be sorted by relevance. Apply the patch, update the database, and search again. Results should now be sorted by call number. Signed-off-by: Liz Rea with the caveat that this will not fix the issue unless the sort order is first set to descending and back to ascending per bug 8012. However, with the sort order set to a proper sort value, this patch does fix the issue. Conflicts: installer/data/mysql/updatedatabase.pl Signed-off-by: Chris Cormack (cherry picked from commit d7d39aaebe324599e11093a78acfde84cebee744) Signed-off-by: Jared Camins-Esakov --- installer/data/mysql/updatedatabase.pl | 8 ++++++++ .../prog/en/modules/admin/preferences/searching.pref | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index adf944b7c9..4fef82808c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4699,6 +4699,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.06.07.001"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("UPDATE systempreferences SET value = 'call_number' WHERE variable = 'defaultSortField' AND value = 'callnumber'"); + $dbh->do("UPDATE systempreferences SET value = 'call_number' WHERE variable = 'OPACdefaultSortField' AND value = 'callnumber'"); + print "Upgrade to $DBversion done (Bug 8657 - Default sort by call number does not work. Correcting system preference value.)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref index 058cbf6fd4..fcf1352ed8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref @@ -100,7 +100,7 @@ Searching: choices: relevance: relevance popularity: total number of checkouts - callnumber: call number + call_number: call number pubdate: date of publication acqdate: date added title: title @@ -132,7 +132,7 @@ Searching: choices: relevance: relevance popularity: total number of checkouts - callnumber: call number + call_number: call number pubdate: date of publication acqdate: date added title: title -- 2.39.5