From 380578203a05c754ccae262d9e47940d2295a82f Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Sat, 18 Apr 2015 17:28:32 -0400 Subject: [PATCH] Bug 9254: Followup - Rename pref to EnhancedMessagingPreferencesOPAC If the new pref is named EnhancedMessagingPreferencesOPAC, it will show up adjacent to EnhancedMessagingPreferences Comment: Works as described. But the patch only hides the link, not disable the feature. If you refresh OPAC after unset EnhancedMessagingPreferencesOPAC, you can still change your messaging preferences. NOTE: Mark Tompsett removed sign off, since he completely reworked it. --- .../Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql b/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql index f1c946e..85adb7d 100644 --- a/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql +++ b/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql @@ -1,6 +1,6 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES - ('OPACEnhancedMessagingPreferences',1, + ('EnhancedMessagingPreferencesOPAC',1, 'Show the patrons messaging preferences page in the OPAC', NULL, 'YesNo'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index a4a43cf..f761a2b 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -118,6 +118,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'), @@ -253,7 +254,6 @@ 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, 'Show the patrons messaging preferences page in the OPAC', NULL, '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 3edf233..4c459f6 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 @@ -56,7 +56,7 @@ Patrons: no: "Don't allow" - patrons to choose which notices they receive and when they receive them. Note that this only applies to certain kinds of notices. - - - pref: OPACEnhancedMessagingPreferences + - pref: EnhancedMessagingPreferencesOPAC choices: yes: Allow no: "Don't allow" diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc index 0c9d149..89a699e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc @@ -78,7 +78,7 @@ [% END %] [% END %] - [% IF ( EnhancedMessagingPreferences && Koha.Preferences('OPACEnhancedMessagingPreferences') ) %] + [% IF ( EnhancedMessagingPreferences && Koha.Preferences('EnhancedMessagingPreferencesOPAC') ) %] [% IF ( messagingview ) %]
  • [% ELSE %] -- 1.9.1