From 7657f20c54e066f95071c4b12bd1875174d6cd87 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 1 Jul 2014 12:18:12 -0400 Subject: [PATCH] [PASSED QA] 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 --- 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, 8 insertions(+), 8 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index c04253a..1759415 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -436,7 +436,6 @@ sub get_template_and_user { OpacMainUserBlock => "" . C4::Context->preference("OpacMainUserBlock"), OpacMainUserBlockMobile => "" . C4::Context->preference("OpacMainUserBlockMobile"), OpacShowFiltersPulldownMobile => C4::Context->preference("OpacShowFiltersPulldownMobile"), - 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 d41ef74..bea8270 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -281,7 +281,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('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'), ('OpacShowFiltersPulldownMobile','1',NULL,'Show the search filters pulldown on the mobile version of the OPAC.','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'), ('opacsmallimage','','','Enter a complete URL to an image to replace the default Koha logo','free'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index c68ba51..087a080 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8560,6 +8560,14 @@ 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 1304cef..bd725ea 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 @@ -204,12 +204,6 @@ OPAC: type: textarea class: code - - - pref: OpacShowLibrariesPulldownMobile - choices: - yes: Show - no: "Don't show" - - the libraries pulldown on the mobile version of the OPAC. - - - pref: OpacShowFiltersPulldownMobile choices: yes: Show -- 1.7.2.5