[#37515261] Syspref cleanup

liblime · Oct 26, 2012 · b637282 · b637282
1 parent d65ae50
commit b637282
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/cgi/admin/systempreferences.pl b/cgi/admin/systempreferences.pl
@@ -137,6 +137,8 @@ =head1 systempreferences.pl
 $tabsysprefs{UsePeriodicals}              = "Cataloging";
 $tabsysprefs{ItemLocation}                = "Cataloging";
 $tabsysprefs{EditAllLibraries}            = "Cataloging";
+$tabsysprefs{SolrAuthUpdateTS}            = "Cataloging";
+$tabsysprefs{SolrBibUpdateTS}             = "Cataloging";
 
 # Circulation
 $tabsysprefs{UseGranularMaxHolds}            = "Circulation";
@@ -216,6 +218,7 @@ =head1 systempreferences.pl
 $tabsysprefs{KeepPreviousBorrowerInterval}   = "Circulation";
 $tabsysprefs{SplitStatistics}                = "Circulation";
 $tabsysprefs{ClearNotForLoan}                = "Circulation";
+$tabsysprefs{PrintNoticesMaxLines}           = "Circulation";
 
 # Staff Client
 $tabsysprefs{TemplateEncoding}            = "StaffClient";
@@ -240,6 +243,8 @@ =head1 systempreferences.pl
 $tabsysprefs{DisplayStafficonsXSLT}       = "StaffClient";
 $tabsysprefs{ShowPatronSearchBySQL}       = "StaffClient";
 $tabsysprefs{WarnOnlyOnMaxFine}           = "StaffClient";
+$tabsysprefs{IntranetUserCSS}             = "StaffClient";
+$tabsysprefs{ShowSupressStatus}           = "StaffClient";
 
 # Patrons
 $tabsysprefs{autoMemberNum}                = "Patrons";
@@ -301,6 +306,9 @@ =head1 systempreferences.pl
 $tabsysprefs{maxItemsinSearchResults} = "Searching";
 $tabsysprefs{OPACShowActiveBranchFirstInResults} = "Searching";
 $tabsysprefs{OpacFacets}              = "Searching";
+$tabsysprefs{SearchFacets}            = "Searching";
+$tabsysprefs{OPACSolrBQ}              = "Searching";
+$tabsysprefs{OPACSolrMM}              = "Searching";
 
 
 # EnhancedContent
@@ -437,6 +445,7 @@ =head1 systempreferences.pl
 $tabsysprefs{OPACShowCancelledHolds}             = "OPAC";
 $tabsysprefs{OPACShowExpiredHolds}               = "OPAC";
 $tabsysprefs{OPACQuickSearchFilter}              = "OPAC";
+$tabsysprefs{NewTitlesAge}                       = "OPAC";
 
 # Serials
 $tabsysprefs{OPACSerialIssueDisplayCount}  = "Serials";

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
@@ -4867,6 +4867,17 @@
     SetVersion ($DBversion);
 }
 
+$DBversion = '4.09.00.014';
+if (C4::Context->preference('Version') < TransformToNum($DBversion)) {
+    for ( qw(AdjustRelevancyRanking NoZebra NoZebraIndexes OPACSolrQF TalkingTechMessagePath) ) {
+        $dbh->do('DELETE FROM systempreferences WHERE variable LIKE ?',
+                 undef, $_);
+    }
+
+    say "Upgrade to $DBversion done ( Cleanup system preferences )";
+    SetVersion ($DBversion);
+}
+
 
 printf "Database schema now up to date at version %s as of %s.\n", $DBversion, scalar localtime;
 

diff --git a/installer/data/syspref_defaults.json b/installer/data/syspref_defaults.json
@@ -983,12 +983,6 @@
       "value" : "0",
       "type" : "YesNo"
    },
-   "TalkingTechMessagePath" : {
-      "explanation" : "Set the file system path for the Talking Tech MESSAGE file",
-      "options" : null,
-      "value" : "/tmp",
-      "type" : "free"
-   },
    "DisplayStafficonsXSLT" : {
       "explanation" : "If ON, displays the format, audience, type icons in the staff XSLT MARC21 result and display pages.",
       "options" : null,
@@ -2062,12 +2056,6 @@
       "options" : null,
       "value" : "1",
       "type" : "YesNo"
-   },
-    "AdjustRelevancyRanking" : {
-      "explanation" : "Specify CCL code to adjust the default relevancy ranking when performing a search in Zebra.",
-      "options" : null,
-      "value" : null,
-      "type" : "Textarea"
    },
    "PrintNoticesMaxLines" : {
       "explanation" : "If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.",
@@ -2105,12 +2093,6 @@
       "value" : null,
       "type" : "free"
    },
-   "OPACSolrQF" : {
-      "explanation" : "Value supplied for the 'qf' parameter in Solr select queries.",
-      "options" : null,
-      "value" : null,
-      "type" : "free"
-   },
    "OPACSolrMM" : {
       "explanation" : "Value supplied for the 'mm' parameter in Solr select queries.",
       "options" : null,

diff --git a/lib/C4/Context.pm b/lib/C4/Context.pm
@@ -34,7 +34,7 @@ use JSON qw(from_json);
 use Koha;
 require Koha::RoseDB;
 
-$VERSION = '4.09.00.013';
+$VERSION = '4.09.00.014';
 
 if ($ENV{'HTTP_USER_AGENT'})	{
     require CGI::Carp;