Bugzilla – Attachment 61517 Details for
Bug 17866
Change sender for claim and order notices
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17866: [QA Follow-up] Reword message for missing email address
Bug-17866-QA-Follow-up-Reword-message-for-missing-.patch (text/plain), 2.36 KB, created by
Marcel de Rooy
on 2017-03-23 09:16:46 UTC
(
hide
)
Description:
Bug 17866: [QA Follow-up] Reword message for missing email address
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2017-03-23 09:16:46 UTC
Size:
2.36 KB
patch
obsolete
>From 21a83d842a8b5390979a2c195c3249798c947333 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 23 Mar 2017 10:01:53 +0100 >Subject: [PATCH] Bug 17866: [QA Follow-up] Reword message for missing email > address >Content-Type: text/plain; charset=utf-8 > >See BZ, comment 14 from Jonathan. > >In the exceptional case that branch email address and fallback, i.e. >preference KohaAdminEmailAddress, are both empty or not valid, the error >message should reflect that (of course :) > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Removed branch email and KohaAdminEmailAddress. >Followed the test plan of the first patch and saw the alert. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt | 4 ++-- > serials/claims.pl | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index 59beed1..a140ebb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -142,8 +142,8 @@ > [% IF error_claim %] > [% IF error_claim == 'no_vendor_email' %] > <div class="dialog alert">This vendor has no email defined for late issues.</div> >- [% ELSIF error_claim == 'no_loggedin_user_email' %] >- <div class="dialog alert">No email is configured for your user.</div> >+ [% ELSIF error_claim == 'bad_or_missing_sender' %] >+ <div class="dialog alert">Bad or missing sender address; check your branch email address or preference KohaAdminEmailAddress.</div> > [% ELSE %] > <div class="dialog alert">[% error_claim %]</div> > [% END %] >diff --git a/serials/claims.pl b/serials/claims.pl >index b4bc94f..38dd601 100755 >--- a/serials/claims.pl >+++ b/serials/claims.pl >@@ -80,7 +80,7 @@ if (@serialnums) { # i.e. they have been flagged to generate claims > if ( $err->{error} eq "no_email" ) { > $template->param( error_claim => 'no_vendor_email' ); > } elsif ( $err->{error} =~ m|Bad or missing From address| ) { >- $template->param( error_claim => 'no_loggedin_user_email' ); >+ $template->param( error_claim => 'bad_or_missing_sender' ); > } > } else { > $template->param( info_claim => 1 ); >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17866
:
58676
|
58677
|
58721
|
59043
|
61473
|
61517
|
61583
|
61584
|
61585
|
61774
|
61776