From 243fd9fd3840af6037478280d07b8ac453ade8f3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 1 Jul 2014 12:27:45 -0400 Subject: [PATCH] Bug 12512 - PROG/CCSR deprecation: Remove OpacShowFiltersPulldownMobile system preference CCSR having been deprecated there is no longer a use for the OpacShowFiltersPulldownMobile 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 | 7 +++++++ .../prog/en/modules/admin/preferences/opac.pref | 6 ------ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 9dba5e5b74..ad6d99bce5 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -439,7 +439,6 @@ sub get_template_and_user { OpacKohaUrl => C4::Context->preference("OpacKohaUrl"), 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"), diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index d820b94da8..03a3f1e406 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -279,7 +279,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OPACShelfBrowser','1','','Enable/disable Shelf Browser on item details page. WARNING: this feature is very resource consuming on collections with large numbers of items.','YesNo'), ('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'), -('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'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 531bb124d7..6028831993 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8589,6 +8589,13 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("DELETE FROM systempreferences WHERE variable='OpacShowFiltersPulldownMobile'"); + print "Upgrade to $DBversion done ( Bug 12512 - PROG/CCSR deprecation: Remove OpacShowFiltersPulldownMobile 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 9fe33121b4..739abb3e47 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: yes: Show no: "Don't show" - the libraries pulldown on the mobile version of the OPAC. - - - - pref: OpacShowFiltersPulldownMobile - choices: - yes: Show - no: "Don't show" - - the search filters 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.39.2