Bugzilla – Attachment 6970 Details for
Bug 5347
late order management
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Follow up - makes error message "no email" translatable
0002-Bug-5347-Set-translatable-the-no-email-error.patch (text/plain), 2.98 KB, created by
Jonathan Druart
on 2011-12-30 09:41:32 UTC
(
hide
)
Description:
Follow up - makes error message "no email" translatable
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2011-12-30 09:41:32 UTC
Size:
2.98 KB
patch
obsolete
>From e2f248c594f63407b5fdd84fdf0e9b2b6c0df6ca Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 30 Dec 2011 10:34:03 +0100 >Subject: [PATCH 2/2] Bug 5347: Set translatable the "no email" error > >--- > C4/Letters.pm | 2 +- > acqui/lateorders.pl | 5 ++++- > .../prog/en/modules/acqui/lateorders.tt | 7 +++++-- > 3 files changed, 10 insertions(+), 4 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index b84984a..8f78ce6 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -399,7 +399,7 @@ sub SendAlerts { > logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues'; > } > } else { >- die "This bookseller has no email\n"; >+ return {error => "no_email" }; > } > > warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug; >diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl >index 998899e..55031ec 100755 >--- a/acqui/lateorders.pl >+++ b/acqui/lateorders.pl >@@ -78,12 +78,15 @@ unless ($delay =~ /^\d{1,3}$/) { > > if ($op and $op eq "send_alert"){ > my @ordernums = $input->param("claim_for");# FIXME: Fallback values? >+ my $err; > eval { >- SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value? >+ $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value? > AddClaim ( $_ ) for @ordernums; > }; > if ( $@ ) { > $template->param(error_claim => $@); >+ } elsif ( defined $err->{error} and $err->{error} eq "no_email" ) { >+ $template->{VARS}->{'error_claim'} = "no_email"; > } else { > $template->{VARS}->{'info_claim'} = 1; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 5ce1fae..0f39504 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -35,7 +35,11 @@ $(document).ready(function() { > <div id="acqui_lateorders"> > > [% IF error_claim %] >- <div class="error">[% error_claim %]</div> >+ [% IF ( error_claim == "no_email" ) %] >+ <div class="error">This bookseller has no email</div> >+ [% ELSE %] >+ <div class="error">[% error_claim %]</div> >+ [% END %] > [% END %] > [% IF info_claim %] > <div class="info">Email has been sent.</div> >@@ -62,7 +66,6 @@ $(document).ready(function() { > <th>Basket</th> > <th>Claims count</th> > <th>Claimed date</th> >- <!-- TMPL_IF name="Supplier" --> > [% IF Supplier %] > <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th> > [% ELSE %] >-- >1.7.7.3 >
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 5347
:
6538
|
6578
|
6634
|
6661
|
6664
|
6782
|
6808
|
6943
|
6961
|
6962
|
6963
|
6969
|
6970
|
6991
|
7008
|
7196
|
8318
|
9165
|
9166
|
9208
|
9254