From 236e815b6c884918431f4614b81e69b58400771c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 1 Jul 2014 12:18:12 -0400 Subject: [PATCH] Bug 12513 - PROG/CCSR deprecation: Remove OpacShowLibrariesPulldownMobile system preference With CCSR having been deprecated there is no longer a use for the OpacShowLibrariesPulldownMobile system preference. This patch removes it. To test, apply the patch and run updatedatabase. Check that the preference can no longer be found in system preferences. Signed-off-by: Bernardo Gonzalez Kriegel Preference removed, no koha-qa errors. Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack --- C4/Auth.pm | 1 - installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 8 +++++++- .../prog/en/modules/admin/preferences/opac.pref | 6 ------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index bb2f3084e8..1768d8a3e4 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -469,7 +469,6 @@ sub get_template_and_user { OpacKohaUrl => C4::Context->preference("OpacKohaUrl"), OpacMainUserBlock => "" . C4::Context->preference("OpacMainUserBlock"), OpacMainUserBlockMobile => "" . C4::Context->preference("OpacMainUserBlockMobile"), - OpacShowLibrariesPulldownMobile => C4::Context->preference("OpacShowLibrariesPulldownMobile"), OpacNav => "" . C4::Context->preference("OpacNav"), OpacNavRight => "" . C4::Context->preference("OpacNavRight"), OpacNavBottom => "" . C4::Context->preference("OpacNavBottom"), diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index e881086d10..d3c328eb7e 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -285,7 +285,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OPACShowBarcode','0','','Show items barcode in holding tab','YesNo'), ('OPACShowCheckoutName','0','','Displays in the OPAC the name of patron who has checked out the material. WARNING: Most sites should leave this off. It is intended for corporate or special sites which need to track who has the item.','YesNo'), ('OPACShowHoldQueueDetails','none','none|priority|holds|holds_priority','Show holds details in OPAC','Choice'), -('OpacShowLibrariesPulldownMobile','1',NULL,'Show the libraries pulldown on the mobile version of the OPAC.','YesNo'), ('OpacShowRecentComments','0',NULL,'If ON a link to recent comments will appear in the OPAC masthead','YesNo'), ('OPACShowUnusedAuthorities','1','','Show authorities that are not being used in the OPAC.','YesNo'), ('OpacStarRatings','all','disable|all|details',NULL,'Choice'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5064c40174..1ece839d88 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8770,7 +8770,6 @@ if(CheckVersion($DBversion)) { SetVersion($DBversion); } - $DBversion = '3.17.00.025'; if ( CheckVersion($DBversion) ) { $dbh->do(qq{ @@ -8891,6 +8890,13 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("DELETE FROM systempreferences WHERE variable='OpacShowLibrariesPulldownMobile'"); + print "Upgrade to $DBversion done ( Bug 12513 - PROG/CCSR deprecation: Remove OpacShowLibrariesPulldownMobile system preference )\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 7a5bfe5f76..d83f63b526 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 @@ -201,12 +201,6 @@ OPAC: - pref: OpacMainUserBlockMobile type: textarea class: code - - - - pref: OpacShowLibrariesPulldownMobile - choices: - yes: Show - no: "Don't show" - - the libraries pulldown on the mobile version of the OPAC. - - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):" - pref: OpacNav -- 2.20.1