From 9a77c4a38c106373a37e6cca9a50b5350819c1f1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 1 Jul 2014 12:43:44 -0400 Subject: [PATCH] Bug 11347 - PROG/CCSR deprecation: Remove opacsmallimage system-preference The opacsmallimage system preference is unused in the bootstrap theme. It can be removed now that prog and ccsr are deprecated. This patch does so. To test, apply the patch and run updatedatabase. Confirm that the OPAC works properly and the preference can no longer be found. 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 | 2 -- C4/Templates.pm | 1 - installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/admin/preferences/opac.pref | 5 ----- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index fb4081fc7d..9dba5e5b74 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -460,7 +460,6 @@ sub get_template_and_user { opacheader => "" . C4::Context->preference("opacheader"), opaclanguagesdisplay => "" . C4::Context->preference("opaclanguagesdisplay"), opacreadinghistory => C4::Context->preference("opacreadinghistory"), - opacsmallimage => "" . C4::Context->preference("opacsmallimage"), opacuserjs => C4::Context->preference("opacuserjs"), opacuserlogin => "" . C4::Context->preference("opacuserlogin"), ShowReviewer => C4::Context->preference("ShowReviewer"), @@ -1066,7 +1065,6 @@ sub checkauth { opaccredits => C4::Context->preference("opaccredits"), OpacFavicon => C4::Context->preference("OpacFavicon"), opacreadinghistory => C4::Context->preference("opacreadinghistory"), - opacsmallimage => C4::Context->preference("opacsmallimage"), opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"), opacuserjs => C4::Context->preference("opacuserjs"), opacbookbag => "" . C4::Context->preference("opacbookbag"), diff --git a/C4/Templates.pm b/C4/Templates.pm index e6675d2c06..16eeec118d 100644 --- a/C4/Templates.pm +++ b/C4/Templates.pm @@ -109,7 +109,6 @@ sub output { $vars->{theme} = $self->theme; $vars->{opaccolorstylesheet} = C4::Context->preference('opaccolorstylesheet'); - $vars->{opacsmallimage} = C4::Context->preference('opacsmallimage'); $vars->{opaclayoutstylesheet} = C4::Context->preference('opaclayoutstylesheet'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index ed427eaee9..d820b94da8 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -284,7 +284,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('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'), ('OpacStarRatings','all','disable|all|details',NULL,'Choice'), ('OpacSuggestionManagedBy',1,'','Show the name of the staff member who managed a suggestion in OPAC','YesNo'), ('OpacSuppression','0','','Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details','YesNo'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 10304544ce..97a7a47fe6 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8570,6 +8570,13 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("DELETE FROM systempreferences WHERE variable='opacsmallimage'"); + print "Upgrade to $DBversion done ( Bug 11347 - PROG/CCSR deprecation: Remove opacsmallimage 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 1304cef74a..9fe33121b4 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 @@ -158,11 +158,6 @@ OPAC: yes: Show no: "Don't show" - images for authorized values (such as lost statuses and locations) in search results and item detail pages on the OPAC. - - - - Use the image at - - pref: opacsmallimage - class: url - - in the OPAC header, instead of the Koha logo. If this image is a different size than the Koha logo, you will need to customize the CSS. (This should be a complete URL, starting with http://.) - - Use the image at - pref: OpacFavicon -- 2.39.5