Add edit and view url tmpl_vars to mailing loop and refactor some variable naming in code.

This commit is contained in:
Martin Kamerbeek 2010-05-26 10:08:39 +02:00
parent dd023d0a0e
commit 5ddd112ea3

View file

@ -115,14 +115,14 @@ sub www_view {
return $self->www_settings unless $self->configurationComplete; return $self->www_settings unless $self->configurationComplete;
my $letters = $self->getMailables; my $mailables = $self->getMailables;
my @newsletterLoop; my @newsletterLoop;
foreach my $letter ( @{ $letters } ) { foreach my $mailing ( @{ $mailables } ) {
my $letterId = $letter->getId; my $mailingId = $mailing->getId;
my @issues; my @issues;
foreach my $issue ( @{ $letter->getIssues } ) { foreach my $issue ( @{ $mailing->getIssues } ) {
my $issueId = $issue->getId; my $issueId = $issue->getId;
my @mailings; my @mailings;
@ -145,7 +145,7 @@ sub www_view {
push @issues, { push @issues, {
%{ $issue->get }, %{ $issue->get },
url => $issue->getUrl, url => $issue->getUrl,
createMailingUrl => $url->page("newsletter=manage;func=createMailing;assetId=$letterId;issueId=$issueId"), createMailingUrl => $url->page("newsletter=manage;func=createMailing;assetId=$mailingId;issueId=$issueId"),
editUrl => $issue->getUrl( 'func=edit' ), editUrl => $issue->getUrl( 'func=edit' ),
sendUrl => '', sendUrl => '',
sendTestUrl => '', sendTestUrl => '',
@ -154,7 +154,9 @@ sub www_view {
} }
push @newsletterLoop, { push @newsletterLoop, {
%{ $letter->get }, %{ $mailing->get },
url => $mailing->getUrl,
editUrl => $mailing->getUrl( 'func=edit' ),
issue_loop => \@issues, issue_loop => \@issues,
issueCount => scalar( @issues ), issueCount => scalar( @issues ),
}; };