From 2db3bfe6b6889800b1e9519e89185cb92a0ccb53 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 11 Sep 2013 10:36:19 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 10862: Followup: fix a couple of issues Content-Type: text/plain; charset="utf-8" This followup fixes a couple of issues: - disable the feature by default. - use the datatables include file. - fix the syspref description. - replace "History search" with "Search history". - replace biblio with catalog Signed-off-by: Owen Leonard --- installer/data/mysql/updatedatabase.pl | 4 ++-- .../en/modules/admin/preferences/searching.pref | 2 +- .../prog/en/modules/catalogue/search-history.tt | 16 +++++++--------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index daded51..f1d329a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7126,9 +7126,9 @@ if ( CheckVersion($DBversion) ) { $DBversion = "3.13.00.XXX"; if ( CheckVersion($DBversion) ) { $dbh->do(q| - INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableSearchHistory','1','','Enable or disable search history','YesNo') + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableSearchHistory','0','','Enable or disable search history','YesNo') |); - print "Upgrade to $DBversion done (MT12541: Add EnableSearchHistory syspref)\n"; + print "Upgrade to $DBversion done (Bug 10862: Add EnableSearchHistory syspref)\n"; SetVersion($DBversion); } 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 b430406..9e14e03 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 @@ -77,7 +77,7 @@ Searching: choices: yes: Keep no: "Don't keep" - - patron search history in the OPAC. + - patron search history in the staff client. Search Form: - - Show tabs in OPAC and staff-side advanced search for limiting searches on the diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index 23bda80..ae48c1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -1,12 +1,10 @@ [% USE Koha %] [% USE KohaDates %] -Koha › Catalog › History search +Koha › Catalog › Search history [% INCLUDE 'doc-head-close.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] -