gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 31743: Change condition for messaging tab 

Note for QA:
The code for SMSnumber is still made dependent on
EnhancedMessagingPreferencesOPAC in order to not
disturb current behavior.
This fixes Enhanced on, EnhancedOPAC off; the case of
Enhanced off is not considered here.

Test plan:
Enable EnhancedMessaging, disable EnhancedMessagingOPAC.
Enable TranslateNotices.
Check if you can only change notice language on OPAC.
Enable EnhancedMessagingOPAC.
Check if you change messaging prefs too.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: marie-luce <marie-luce.laflamme@inlibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Marcel de Rooy 2022-10-13 06:19:27 +00:00 committed by Tomas Cohen Arazi
parent 07c5776ed9
commit 894c6dd0fe
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
View File

@ -102,7 +102,7 @@
[% END %]
[% IF ( EnhancedMessagingPreferences ) %]
[% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]
[% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) || Koha.Preference('TranslateNotices') %]
[% IF ( messagingview ) %]
<li class="active">
[% ELSE %]

8
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
View File

@ -34,7 +34,7 @@
</div>
<div class="col-md-12 col-lg-10 order-1">
[% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]
[% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) || Koha.Preference('TranslateNotices') %]
<div id="usermessaging" class="maincontent">
<h1>Your messaging settings</h1>
[% IF ( settings_updated ) %]
@ -44,6 +44,7 @@
<input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
<input type="hidden" name="modify" value="yes" />
[% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]
<table class="table table-bordered table-condensed table-striped">
<caption class="sr-only">Your messaging settings</caption>
<thead>
@ -173,8 +174,9 @@
</tr>
[% END # / FOREACH messaging_preferences%]
</tbody>
</table>
</tbody>
</table>
[% END %]
[% IF ( SMSSendDriver || Koha.Preference('TranslateNotices') ) %]
<fieldset class="rows">

40
opac/opac-messaging.pl
View File

@ -31,8 +31,9 @@ use Koha::SMS::Providers;
use Koha::Token;
my $query = CGI->new();
my $opac_messaging = C4::Context->preference('EnhancedMessagingPreferencesOPAC');
unless ( C4::Context->preference('EnhancedMessagingPreferencesOPAC') and
unless ( ( $opac_messaging or C4::Context->preference('TranslateNotices') ) and
C4::Context->preference('EnhancedMessagingPreferences') ) {
print $query->redirect("/cgi-bin/koha/errors/404.pl");
exit;
@ -48,7 +49,8 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
my $patron = Koha::Patrons->find( $borrowernumber ); # FIXME and if borrowernumber is invalid?
my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
my $messaging_options;
$messaging_options = C4::Members::Messaging::GetMessagingOptions() if $opac_messaging;
if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) {
die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
@ -56,33 +58,37 @@ if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) {
token => scalar $query->param('csrf_token'),
});
my $sms = $query->param('SMSnumber');
my $sms_provider_id = $query->param('sms_provider_id');
$patron->set({
smsalertnumber => $sms,
sms_provider_id => $sms_provider_id,
})->store;
if( $opac_messaging ) {
my $sms = $query->param('SMSnumber');
my $sms_provider_id = $query->param('sms_provider_id');
$patron->set({
smsalertnumber => $sms,
sms_provider_id => $sms_provider_id,
})->store;
C4::Form::MessagingPreferences::handle_form_action($query, { borrowernumber => $patron->borrowernumber }, $template);
C4::Form::MessagingPreferences::handle_form_action($query, { borrowernumber => $patron->borrowernumber }, $template);
}
if ( C4::Context->preference('TranslateNotices') ) {
$patron->set({ lang => scalar $query->param('lang') })->store;
}
}
C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $patron->borrowernumber }, $template);
C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $patron->borrowernumber }, $template) if $opac_messaging;
$template->param(
messagingview => 1,
SMSnumber => $patron->smsalertnumber, # FIXME This is already sent 2 lines above
SMSSendDriver => C4::Context->preference("SMSSendDriver"),
TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification") );
messagingview => 1,
SMSnumber => $patron->smsalertnumber, # FIXME This is already sent 2 lines above
SMSSendDriver => C4::Context->preference("SMSSendDriver"),
TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"),
);
if ( C4::Context->preference("SMSSendDriver") eq 'Email' ) {
if( $opac_messaging && C4::Context->preference("SMSSendDriver") eq 'Email' ) {
my @providers = Koha::SMS::Providers->search( {}, { order_by => 'name' } )->as_list;
$template->param(
sms_providers => \@providers,
sms_provider_id => $patron->sms_provider_id );
sms_providers => \@providers,
sms_provider_id => $patron->sms_provider_id,
);
}
my $new_session_id = $query->cookie('CGISESSID');