From b52d36ddce07a45db18d6341a02f0c6bfd88f822 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 19 Feb 2013 14:49:20 +0100 Subject: [PATCH] Bug 9043: Changes to the advanced search page New syspref: OpacAdvSearch. This syspref is multivalued and you can add or remove some elements on the adv search page. --- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/admin/preferences/opac.pref | 11 ++++++++++ .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 21 ++++++++++++++++++-- opac/opac-search.pl | 5 ++++- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index fbd0387..df06695 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -427,3 +427,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo'); INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHoldNotes',0,'Show hold notes on OPAC','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearch','pubdate|itemtype|language|subtype|sorting|location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5963d24..2b70220 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7010,6 +7010,13 @@ CREATE TABLE IF NOT EXISTS borrower_files ( SetVersion($DBversion); } +$DBversion = "3.11.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearch','pubdate|itemtype|language|subtype|sorting|location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple');"); + print "Upgrade to $DBversion done (Bug 9043: Add OpacAdvSearch)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 90295ef..01dba1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -619,3 +619,14 @@ OPAC: - pref: PatronSelfRegistrationAdditionalInstructions type: textarea class: html + Advanced Search Options: + - + - Show search options + - pref: OpacAdvSearch + multiple: + pubdate: Publication date + itemtype: Item types + language: Language + subtype: Subtypes + sorting: Sorting + location: Location diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt index 6d9ff8e..936fb7a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt @@ -145,6 +145,7 @@ [New search] +[% IF OpacAdvSearch.grep('pubdate').size > 0 || expanded_options %]
@@ -156,7 +157,10 @@
+[% END %] +
+[% IF OpacAdvSearch.grep('itemtype').size > 0 || expanded_options %]
    [% FOREACH advsearchloo IN advancedsearchesloop %] @@ -188,6 +192,9 @@
[% END %]
+[% END %] + +[% IF OpacAdvSearch.grep('language').size > 0 || expanded_options %]
Language @@ -205,7 +212,9 @@
-[% IF ( expanded_options ) %] +[% END %] + +[% IF OpacAdvSearch.grep('subtype').size > 0 || expanded_options %] [% IF ( usmarc ) %]
@@ -278,10 +287,11 @@ [% INCLUDE 'subtypes_unimarc.inc' %]
[% END %] [% END %] - +
+[% IF OpacAdvSearch.grep('location').size > 0 || expanded_options %]
[% UNLESS ( singleBranchMode ) %] @@ -312,6 +322,9 @@ [% END %]
+[% END%] + +[% IF OpacAdvSearch.grep('sorting').size > 0 || expanded_options %]
Sorting: @@ -320,8 +333,10 @@
+[% END %]
+[% IF OpacAdvSearch.size > 0 || expanded_options %]
@@ -335,6 +350,8 @@
+[% END %] +