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

Bug 17866: [QA Follow-up] Reword message for missing email address 

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.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Marcel de Rooy 2017-03-23 10:01:53 +01:00 committed by Kyle M Hall
parent bc73b93886
commit 5e8366d77a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
View File

@ -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 %]

2
serials/claims.pl
View File

@ -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 );