Attachment #21048 for bug #10862

View | Details | Raw Unified | Return to bug 10862
Collapse All | Expand All

Lines 7126-7134 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-2 / +2 lines)
7126	$DBversion = "3.13.00.XXX";	7126	$DBversion = "3.13.00.XXX";
7127	if ( CheckVersion($DBversion) ) {	7127	if ( CheckVersion($DBversion) ) {
7128	$dbh->do(q\|	7128	$dbh->do(q\|
7129	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableSearchHistory','1','','Enable or disable search history','YesNo')	7129	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableSearchHistory','0','','Enable or disable search history','YesNo')
7130	\|);	7130	\|);
7131	print "Upgrade to $DBversion done (MT12541: Add EnableSearchHistory syspref)\n";	7131	print "Upgrade to $DBversion done (Bug 10862: Add EnableSearchHistory syspref)\n";
7132	SetVersion($DBversion);	7132	SetVersion($DBversion);
7133	}	7133	}
7134		7134

Lines 77-83 Searching: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (-1 / +1 lines)
77	choices:	77	choices:
78	yes: Keep	78	yes: Keep
79	no: "Don't keep"	79	no: "Don't keep"
80	- patron search history in the OPAC.	80	- patron search history in the staff client.
81	Search Form:	81	Search Form:
82	-	82	-
83	- Show tabs in OPAC and staff-side advanced search for limiting searches on the	83	- Show tabs in OPAC and staff-side advanced search for limiting searches on the




[% USE Koha %]
[% USE KohaDates %]
<title>Koha &rsaquo; Catalog &rsaquo; Search history</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% 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?");

[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs">
  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Search history
</div>

<div id="doc3" class="yui-t2">

      <h1>Search history</h1>
      <div id="tabs" class="toptabs">
        <ul>
          <li><a href="#biblio_tab">Catalog</a></li>
          <li><a href="#authority_tab">Authority</a></li>
        </ul>
        <div id="biblio_tab">

              <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 catalog history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
            </form>
            <table class="historyt">
              <thead>

              <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 catalog search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
            </form>
            <table class="historyt">
              <thead>

          [% END %]

          [% IF !current_biblio_searches && !previous_biblio_searches %]
            <p>Your catalog search history is empty.</p>
          [% END %]
        </div>

- 

Return to bug 10862

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt (-10 / +7 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
3	<title>Koha &rsaquo; Catalog &rsaquo; History search</title>	3	<title>Koha &rsaquo; Catalog &rsaquo; Search history</title>
4	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
5	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />	5	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
6	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>	6	[% INCLUDE 'datatables.inc' %]
7	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>	7	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
8	[% INCLUDE 'datatables-strings.inc' %]
9	<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
10	<script type="text/javascript">	8	<script type="text/javascript">
11	//<![CDATA[	9	//<![CDATA[
12	var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?");	10	var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?");
Lines 34-40 $(document).ready(function() { Link Here
34	[% INCLUDE 'cat-search.inc' %]	32	[% INCLUDE 'cat-search.inc' %]
35		33
36	<div id="breadcrumbs">	34	<div id="breadcrumbs">
37	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; History search	35	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; Search history
38	</div>	36	</div>
39		37
40	<div id="doc3" class="yui-t2">	38	<div id="doc3" class="yui-t2">
Lines 45-51 $(document).ready(function() { Link Here
45	<h1>Search history</h1>	43	<h1>Search history</h1>
46	<div id="tabs" class="toptabs">	44	<div id="tabs" class="toptabs">
47	<ul>	45	<ul>
48	<li><a href="#biblio_tab">Biblio</a></li>	46	<li><a href="#biblio_tab">Catalog</a></li>
49	<li><a href="#authority_tab">Authority</a></li>	47	<li><a href="#authority_tab">Authority</a></li>
50	</ul>	48	</ul>
51	<div id="biblio_tab">	49	<div id="biblio_tab">
Lines 55-61 $(document).ready(function() { Link Here
55	<input type="hidden" name="action" value="delete" />	53	<input type="hidden" name="action" value="delete" />
56	<input type="hidden" name="previous" value="0" />	54	<input type="hidden" name="previous" value="0" />
57	<input type="hidden" name="type" value="biblio" />	55	<input type="hidden" name="type" value="biblio" />
58	<input type="submit" class="deleteshelf" value="Delete your current biblio history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />	56	<input type="submit" class="deleteshelf" value="Delete your current catalog history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
59	</form>	57	</form>
60	<table class="historyt">	58	<table class="historyt">
61	<thead>	59	<thead>
Lines 83-89 $(document).ready(function() { Link Here
83	<input type="hidden" name="action" value="delete" />	81	<input type="hidden" name="action" value="delete" />
84	<input type="hidden" name="previous" value="1" />	82	<input type="hidden" name="previous" value="1" />
85	<input type="hidden" name="type" value="biblio" />	83	<input type="hidden" name="type" value="biblio" />
86	<input type="submit" class="deleteshelf" value="Delete your previous biblio search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />	84	<input type="submit" class="deleteshelf" value="Delete your previous catalog search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
87	</form>	85	</form>
88	<table class="historyt">	86	<table class="historyt">
89	<thead>	87	<thead>
Lines 106-112 $(document).ready(function() { Link Here
106	[% END %]	104	[% END %]
107		105
108	[% IF !current_biblio_searches && !previous_biblio_searches %]	106	[% IF !current_biblio_searches && !previous_biblio_searches %]
109	<p>Your biblio search history is empty.</p>	107	<p>Your catalog search history is empty.</p>
110	[% END %]	108	[% END %]
111	</div>	109	</div>
112		110
113	-