Bugzilla – Attachment 29484 Details for
Bug 12246
PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference
PASSED-QA-Bug-12246---PROGCCSR-deprecation-Remove-.patch (text/plain), 3.61 KB, created by
Kyle M Hall (khall)
on 2014-07-03 14:35:38 UTC
(
hide
)
Description:
[PASSED QA] Bug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-07-03 14:35:38 UTC
Size:
3.61 KB
patch
obsolete
>From 9e8dcf151945dd576c261d97b6fa74fbec271aab Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 1 Jul 2014 11:56:28 -0400 >Subject: [PATCH] [PASSED QA] Bug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference > >With CCSR having been deprecated there is no longer a use for the >OpacMainUserBlockMobile 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 <bgkriegel@gmail.com> >Preference removed, no koha-qa errors > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > installer/data/mysql/sysprefs.sql | 1 - > installer/data/mysql/updatedatabase.pl | 7 +++++++ > .../prog/en/modules/admin/preferences/opac.pref | 5 ----- > 3 files changed, 7 insertions(+), 6 deletions(-) > >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index d41ef74..c93968c 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -251,7 +251,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('OpacLocationBranchToDisplayShelving','holding','holding|home|both','In the OPAC, display the shelving location under which which column.', 'Choice'), > ('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'), > ('OpacMainUserBlock','Welcome to Koha...\r\n<hr>','70|10','A user-defined block of HTML in the main content area of the opac main page','Textarea'), >-('OpacMainUserBlockMobile','',NULL,'Show the following HTML in its own column on the main page of the OPAC (mobile version):','free'), > ('OpacMaxItemsToDisplay','50','','Max items to display at the OPAC on a biblio detail','Integer'), > ('OPACMobileUserCSS','',NULL,'Include the following CSS for the mobile view on all pages in the OPAC:','free'), > ('OPACMySummaryHTML','','70|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my reading history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'), >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index c68ba51..449d6d3 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='OpacMainUserBlockMobile'"); >+ print "Upgrade to $DBversion done ( Bug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile 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..64c9e54 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 >@@ -199,11 +199,6 @@ OPAC: > type: textarea > class: code > - >- - "Show the following HTML in its own column on the main page of the OPAC (mobile version):" >- - pref: OpacMainUserBlockMobile >- type: textarea >- class: code >- - > - pref: OpacShowLibrariesPulldownMobile > choices: > yes: Show >-- >1.7.2.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 12246
:
29415
|
29468
| 29484