Bugzilla – Attachment 29470 Details for
Bug 11347
PROG/CCSR deprecation: Remove opacsmallimage system-preference
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 11347 - PROG/CCSR deprecation: Remove opacsmallimage system-preference
SIGNED-OFF-Bug-11347---PROGCCSR-deprecation-Remove.patch (text/plain), 5.46 KB, created by
Bernardo Gonzalez Kriegel
on 2014-07-03 13:03:49 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 11347 - PROG/CCSR deprecation: Remove opacsmallimage system-preference
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2014-07-03 13:03:49 UTC
Size:
5.46 KB
patch
obsolete
>From ea80831e5834d89c55ffdb06e026e5236847c16c Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 1 Jul 2014 12:43:44 -0400 >Subject: [PATCH] [SIGNED-OFF] 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 <bgkriegel@gmail.com> >Preference removed, no koha-qa errors >--- > 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 c04253a..aecc0c1 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -456,7 +456,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"), >@@ -1062,7 +1061,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 8d13a49..60d23fc 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 d41ef74..382932e 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 c68ba51..0ef13e8 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8560,6 +8560,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 1304cef..9fe3312 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 >@@ -160,11 +160,6 @@ OPAC: > - images for <a href="/cgi-bin/koha/admin/authorised_values.pl">authorized values</a> (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 <code>http://</code>.) >- - >- - Use the image at > - pref: OpacFavicon > class: url > - for the OPAC's favicon. (This should be a complete URL, starting with <code>http://</code>.) >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11347
:
29418
|
29470
|
29483