Attachment 46217 Details for Bug 12528 – Bug 12528: Bug 9254: Followup - Rename pref to EnhancedMessagingPreferencesOPAC

[patch] Bug 12528: Bug 9254: Followup - Rename pref to EnhancedMessagingPreferencesOPAC

Bug-12528-Bug-9254-Followup---Rename-pref-to-Enhan.patch (text/plain), 6.53 KB, created by Jonathan Druart on 2016-01-04 09:27:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-01-04 09:27:14 UTC

Size: 6.53 KB

patch

obsolete

>From a27df4a6508d371ce12747d0ea6b242b678f6b9d Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Mon, 4 Jan 2016 09:21:07 +0000
>Subject: [PATCH] Bug 12528: Bug 9254: Followup - Rename pref to
> EnhancedMessagingPreferencesOPAC
>
>If the new pref is named EnhancedMessagingPreferencesOPAC, it will show
>up adjacent to EnhancedMessagingPreferences
>---
> installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql               | 2 +-
> installer/data/mysql/sysprefs.sql                                     | 3 ++-
> .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref      | 4 ++--
> koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc                | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt            | 2 +-
> 5 files changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql b/installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql
>index db5275d..793c119 100644
>--- a/installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql
>+++ b/installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql
>@@ -1,2 +1,2 @@
> INSERT INTO systempreferences ( value, variable, options, explanation,type )
>-select value ,'OPACEnhancedMessagingPreferences', NULL, 'If ON, allows patrons to select to receive additional messages about items due or nearly due.', 'YesNo' from systempreferences where variable='EnhancedMessagingPreferences';
>+select value ,'EnhancedMessagingPreferencesOPAC', NULL, 'If ON, allows patrons to select to receive additional messages about items due or nearly due.', 'YesNo' from systempreferences where variable='EnhancedMessagingPreferences';
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 4aeecca..4f6b2a7 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -135,6 +135,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('EnableOpacSearchHistory','1','YesNo','Enable or disable opac search history',''),
> ('EnableSearchHistory','0','','Enable or disable search history','YesNo'),
> ('EnhancedMessagingPreferences','0','','If ON, allows patrons to select to receive additional messages about items due or nearly due.','YesNo'),
>+('EnhancedMessagingPreferencesOPAC',1, 'Show the patrons messaging preferences page in the OPAC', NULL, 'YesNo'),
> ('expandedSearchOption','0',NULL,'If ON, set advanced search to be expanded by default','YesNo'),
> ('ExpireReservesMaxPickUpDelay','0','','Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay','YesNo'),
> ('ExpireReservesMaxPickUpDelayCharge','0',NULL,'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.','free'),
>@@ -278,7 +279,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
> ('OPACdidyoumean',NULL,NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
> ('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
>-('OPACEnhancedMessagingPreferences', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'),
>+('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'),
> ('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'),
> ('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
> ('OpacFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','free'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>index 689c708..91546ea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>@@ -54,7 +54,7 @@ Patrons:
>            choices:
>                yes: Allow
>                no: "Don't allow"
>-         - "Staff to manage which notices patrons will receive and when they will receive them. Note: this only applies to courtesy notices. To manage if patrons have also access to these settings, use OPACEnhancedMessagingPreferences."
>+         - "Staff to manage which notices patrons will receive and when they will receive them. Note: this only applies to courtesy notices. To manage if patrons have also access to these settings, use EnhancedMessagingPreferencesOPAC."
>      -
>          - pref: ExtendedPatronAttributes
>            choices:
>@@ -160,7 +160,7 @@ Patrons:
>                no: "Don't"
>          - charge a fee when a patron changes to a category with an enrollment fee.
>      -
>-         - pref: OPACEnhancedMessagingPreferences
>+         - pref: EnhancedMessagingPreferencesOPAC
>            choices:
>                yes: Show
>                no: "Don't show"
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
>index a8b0a5e..9afa331 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
>@@ -77,7 +77,7 @@
>             [% END %]
> 
>             [% IF ( EnhancedMessagingPreferences ) %]
>-                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' ) %]
>+                [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]
>                     [% IF ( messagingview ) %]
>                         <li class="active">
>                     [% ELSE %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>index 32d78bc..e37ec7d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>@@ -22,7 +22,7 @@
>                 </div>
>             </div>
>             <div class="span10">
>-                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' )  %]
>+                [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' )  %]
>                 <div id="usermessaging">
>                     <h3>Your messaging settings</h3>
>                     [% IF ( settings_updated ) %]
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 12528: 29505 | 30259 | 30348 | 30349 | 30487 | 31047 | 36511 | 36512 | 36513 | 36818 | 44302 | 44820 | 44826 | 45885 | 45886 | 45962 | 46003 | 46015 | 46082 | 46156 | 46217 | 46218 | 50649 | 50650 | 50651 | 50652 | 50988 | 50989 | 51000 | 51001 | 51002 | 51003 | 51004