Creates a separate syspref OPACAdvancedSearchTypes so that staff and OPAC
advanced search can use different settings for item type or collection code
limits.
---
admin/systempreferences.pl | 1 +
installer/data/mysql/en/mandatory/sysprefs.sql | 1 +
.../1-Obligatoire/unimarc_standard_systemprefs.sql | 3 ++-
.../ru-RU/mandatory/system_preferences_optimal.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++++++
opac/opac-search.pl | 2 +-
6 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index e96c109..17c8bfb 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -233,6 +233,7 @@ $tabsysprefs{sortbynonfiling} = "Searching";
$tabsysprefs{QueryAutoTruncate} = "Searching";
$tabsysprefs{QueryRemoveStopwords} = "Searching";
$tabsysprefs{AdvancedSearchTypes} = "Searching";
+$tabsysprefs{OPACAdvancedSearchTypes} = "Searching";
# EnhancedContent
$tabsysprefs{AmazonEnabled} = "EnhancedContent";
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql
b/installer/data/mysql/en/mandatory/sysprefs.sql
index 6f60fa7..2f4d439 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -262,3 +262,4 @@ INSERT INTO `systempreferences`
(variable,value,explanation,options,type) VALUES
INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1',
'', 'If ON, displays the format, audience, type icons in XSLT MARC21 results
and display pages.', 'YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type)
VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any
message','','YesNo');
INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck',
'0', 'If ON, displays patron image when a patron uses web-based
self-checkout', '', 'YesNo');
+INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('OPACAdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which
set of fields comprise the Type limit in the OPAC advanced search','Choice');
diff --git
a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index bee360a..8e5b0ae 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -212,7 +212,7 @@ INSERT INTO `systempreferences`
(variable,value,options,explanation,type) VALUES
INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('OPACShelfBrowser','1','','Active le parcours des rayonnages sur la page
de détail','YesNo');
INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details
page display on OPAC WARNING: MARC21 Only','YesNo');
INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results
page display on OPAC WARNING: MARC21 Only','YesNo');
-INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of
fields comprise the Type limit in the advanced search','Choice');
+INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Définit quel jeu de
champs est utilisé pour la limitation par type de document dans la recherche
avancée.','Choice');
INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items
that are not on loan', 'YesNo');
INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed
on damaged items', 'YesNo');
INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature,
requires further setup, ask your system administrator for details', 'YesNo');
@@ -261,3 +261,4 @@ INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('H
INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1',
'', 'Si activé, affiche le format, le type de public et les icônes de type en
XSLT (MARC21)).', 'YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type)
VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any
message','','YesNo');
INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck',
'0', 'Si activé, affiche la photo de l''adhérent lors de l''utilisation de la
console de prêt auto-contrôlé', '', 'YesNo');
+INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('OPACAdvancedSearchTypes','itemtypes','itemtypes|ccode','Définit quel
jeu de champs est utilisé pour la limitation par type de document dans la
recherche avancée de l'OPAC.','Choice');
diff --git
a/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql
b/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql
index 61318c0..81bee4a 100644
--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql
+++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql
@@ -238,3 +238,4 @@ INSERT INTO systempreferences
(variable,value,explanation,options,type) VALUES('
INSERT INTO systempreferences (variable,value,explanation,options,type)
VALUES('MergeAuthoritiesOnUpdate', '1', 'if ON, Updating authorities will
automatically updates biblios',NULL,'YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type)
VALUES('AllowNotForLoanOverride', '0', 'if ON, enables the librarian to choose
when they want to check out a notForLoan regular item',NULL,'YesNo');
INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1',
'', 'If ON, displays the format, audience, type icons in XSLT MARC21 results
and display pages.', 'YesNo');
+INSERT INTO `systempreferences` (variable,value,options,explanation,type)
VALUES('OPACAdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which
set of fields comprise the Type limit in the OPAC advanced search','Choice');
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 10c3451..a860ff0 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2675,6 +2675,13 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
+$DBversion = "3.00.00.062";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO `systempreferences`
(variable,value,options,explanation,type)
VALUES('OPACAdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which
set of fields comprise the Type limit in the OPAC advanced search','Choice')");
+ print "Upgrade to $DBversion done (added new OPACAdvancedSearchTypes
syspref)\n";
+ SetVersion ($DBversion);
+}
+
=item DropAllForeignKeys($table)
Drop all foreign keys of the table $table
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index a7f7470..5369f64 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -129,7 +129,7 @@ my $itype_or_itemtype =
(C4::Context->preference("item-level_itypes"))?'itype':'
my @itemtypesloop;
my $selected=1;
my $cnt;
-my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
+my $advanced_search_types = C4::Context->preference("OPACAdvancedSearchTypes");
if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp
$itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
--
1.5.6.5
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
