From e07b28ad49e006c1da1b33fba8c14e0a1011ff67 Mon Sep 17 00:00:00 2001 From: simith Date: Wed, 30 Jul 2014 10:56:43 -0400 Subject: [PATCH] Bug 12528 - Enable staff to deny message setting access to patrons on the OPAC This fix permits the staff to pull apart the access to patron message setting. Modified: installer/data/mysql/sysprefs.sql -OPACEnhancedMessagingPreferences preference added koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref -OPACEnhancedMessagingPreferences preference added koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc -access to message setting changed Testing: I Apply the patch II Run updatedatabase.pl 0) Search OPACEnhancedMessagingPreferences preference; 1) Validate "OPACEnhancedMessagingPreferences show patron messaging setting on the OPAC (NOTE: EnhancedMessagingPreferences must be enabled)."; 2) Disable OPACEnhancedMessagingPreferences preference; 3) Enable EnhancedMessagingPreferences preference; 4) On the OPAC -> user's settings, validate "your messaging" is not showed. --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 8 ++++++-- opac/opac-messaging.pl | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) 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 21c40c7..881d8d3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -5,7 +5,6 @@ [% INCLUDE 'masthead.inc' %] -

+ [% IF (Authorized) %]

Your messaging settings

[% IF ( settings_updated ) %] @@ -120,6 +120,10 @@

+ [% ELSE %] +

You are not allowed to call this page directly

+ To report this problem, you can email the Koha Administrator. + [% END %]

@@ -142,4 +146,4 @@ }); //]]> -[% END %] +[% END %] \ No newline at end of file diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl index 096dbff..74d95ef 100755 --- a/opac/opac-messaging.pl +++ b/opac/opac-messaging.pl @@ -68,6 +68,8 @@ $template->param( BORROWER_INFO => [ $borrower ], messagingview => 1, SMSnumber => defined $borrower->{'smsalertnumber'} ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'}, SMSSendDriver => C4::Context->preference("SMSSendDriver"), - TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification") ); + TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"), + admin => C4::Context->preference('KohaAdminEmailAddress'), + Authorized => C4::Context->preference('OPACEnhancedMessagingPreferences')); output_html_with_http_headers $query, $cookie, $template->output; -- 1.9.1