summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
acb672c)
The value of the letter variable was not being correctly passed
to the edit template instead it was reset to none
Also compressed some verbage from letter_loop generation
(if you want a scalar use one)
removed an unused $count variable (?!)
and put a couple of lone )s back on the line they came from
Resend to remove wrong utf-9 header.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
$subs->{$_} = format_date($subs->{$_});
}
}
$subs->{$_} = format_date($subs->{$_});
}
}
- $subs->{'letter'}='' unless($subs->{'letter'});
+ if (!defined $subs->{letter}) {
+ $subs->{letter}= q{};
+ }
letter_loop($subs->{'letter'}, $template);
$nextexpected = GetNextExpected($subscriptionid);
$nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ;
letter_loop($subs->{'letter'}, $template);
$nextexpected = GetNextExpected($subscriptionid);
$nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ;
$template->param(branchloop => $branchloop,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
$template->param(branchloop => $branchloop,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
# prepare template variables common to all $op conditions:
# prepare template variables common to all $op conditions:
-$template->param( 'dateformat_' . C4::Context->preference('dateformat') => 1 ,
- );
+$template->param( 'dateformat_' . C4::Context->preference('dateformat') => 1 );
+if ($op!~/^mod/) {
+ letter_loop(q{}, $template);
+}
if ($op eq 'addsubscription') {
redirect_add_subscription();
if ($op eq 'addsubscription') {
redirect_add_subscription();
}
push( @sub_type_data, \%row );
}
}
push( @sub_type_data, \%row );
}
- $template->param(subtype => \@sub_type_data,
- );
+ $template->param(subtype => \@sub_type_data);
- letter_loop('', $template);
my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
if (defined $new_biblionumber) {
my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
if (defined $new_biblionumber) {
sub letter_loop {
my ($selected_letter, $templte) = @_;
my $letters = GetLetters('serial');
sub letter_loop {
my ($selected_letter, $templte) = @_;
my $letters = GetLetters('serial');
- my @letterloop;
- foreach my $thisletter (keys %$letters) {
- my $selected = $thisletter eq $selected_letter ? 1 : 0;
- push @letterloop, {
+ my $letterloop;
+ foreach my $thisletter (keys %{$letters}) {
+ push @{$letterloop}, {
+ selected => $thisletter eq $selected_letter,
lettername => $letters->{$thisletter},
};
}
lettername => $letters->{$thisletter},
};
}
- $templte->param(letterloop => \@letterloop) if @letterloop;
+ $templte->param(letterloop => $letterloop);