Attachment 42162 Details for Bug 14683 – Bug 14683: [QA Follow-up] Similar change for staff

[patch] Bug 14683: [QA Follow-up] Similar change for staff

Bug-14683-QA-Follow-up-Similar-change-for-staff.patch (text/plain), 1.84 KB, created by Marcel de Rooy on 2015-09-01 14:21:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2015-09-01 14:21:40 UTC

Size: 1.84 KB

patch

obsolete

>From 585d974ce2673d6e0b678289ece64e968c34411a Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Tue, 1 Sep 2015 16:11:54 +0200
>Subject: [PATCH] Bug 14683: [QA Follow-up] Similar change for staff
>Content-Type: text/plain; charset=utf-8
>
>Script memberentry.pl contained a similar line.
>Solution is simpler here.
>
>Test plan:
>[1] Add, change or clear the sms number at staff side.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> members/memberentry.pl |   14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 7904e55..90ed2da 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -365,14 +365,10 @@ if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save'|| $op eq 'duplicate')
>     }
> }
> 
>-if (
>-        defined $input->param('SMSnumber')
>-    &&  (
>-           $input->param('SMSnumber') eq ""
>-        or $input->param('SMSnumber') ne $newdata{'mobile'}
>-        )
>-) {
>-    $newdata{smsalertnumber} = $input->param('SMSnumber');
>+# BZ 14683: Do not mixup mobile [read: other phone] with smsalertnumber
>+my $sms = $input->param('SMSnumber');
>+if ( defined $sms ) {
>+    $newdata{smsalertnumber} = $sms;
> }
> 
> ###  Error checks should happen before this line.
>@@ -688,7 +684,7 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) {
>         C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
>     }
>     $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
>-    $template->param(SMSnumber     => defined $data{'smsalertnumber'} ? $data{'smsalertnumber'} : $data{'mobile'});
>+    $template->param(SMSnumber     => $data{'smsalertnumber'} );
>     $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
> }
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 14683: 41664 | 42050 | 42051 | 42162 | 42187 | 42188 | 42189