Bugzilla – Attachment 22101 Details for
Bug 10862
Add an search history for the staff interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10862: Followup: fix a couple of issues
Bug-10862-Followup-fix-a-couple-of-issues.patch (text/plain), 5.81 KB, created by
Chris Cormack
on 2013-10-20 19:39:21 UTC
(
hide
)
Description:
Bug 10862: Followup: fix a couple of issues
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2013-10-20 19:39:21 UTC
Size:
5.81 KB
patch
obsolete
>From 1181f84ca5f2cdc94a0698187d1f3da21218e610 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Wed, 11 Sep 2013 10:36:19 +0200 >Subject: [PATCH] Bug 10862: Followup: fix a couple of issues > >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 <oleonard@myacpl.org> >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >--- > installer/data/mysql/updatedatabase.pl | 4 ++-- > .../prog/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 7135261..a6ff38c 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -7315,9 +7315,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 %] >-<title>Koha › Catalog › History search</title> >+<title>Koha › Catalog › Search history</title> > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+[% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> >-[% INCLUDE 'datatables-strings.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?"); >@@ -34,7 +32,7 @@ $(document).ready(function() { > [% INCLUDE 'cat-search.inc' %] > > <div id="breadcrumbs"> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › History search >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Search history > </div> > > <div id="doc3" class="yui-t2"> >@@ -45,7 +43,7 @@ $(document).ready(function() { > <h1>Search history</h1> > <div id="tabs" class="toptabs"> > <ul> >- <li><a href="#biblio_tab">Biblio</a></li> >+ <li><a href="#biblio_tab">Catalog</a></li> > <li><a href="#authority_tab">Authority</a></li> > </ul> > <div id="biblio_tab"> >@@ -55,7 +53,7 @@ $(document).ready(function() { > <input type="hidden" name="action" value="delete" /> > <input type="hidden" name="previous" value="0" /> > <input type="hidden" name="type" value="biblio" /> >- <input type="submit" class="deleteshelf" value="Delete your current biblio history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> >+ <input type="submit" class="deleteshelf" value="Delete your current catalog history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> > </form> > <table class="historyt"> > <thead> >@@ -83,7 +81,7 @@ $(document).ready(function() { > <input type="hidden" name="action" value="delete" /> > <input type="hidden" name="previous" value="1" /> > <input type="hidden" name="type" value="biblio" /> >- <input type="submit" class="deleteshelf" value="Delete your previous biblio search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> >+ <input type="submit" class="deleteshelf" value="Delete your previous catalog search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> > </form> > <table class="historyt"> > <thead> >@@ -106,7 +104,7 @@ $(document).ready(function() { > [% END %] > > [% IF !current_biblio_searches && !previous_biblio_searches %] >- <p>Your biblio search history is empty.</p> >+ <p>Your catalog search history is empty.</p> > [% END %] > </div> > >-- >1.8.4.rc3
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10862
:
20953
|
20982
|
21005
|
21047
|
21048
|
21049
|
22100
| 22101 |
22102