From 5ddd112ea3ae068e52b6438eeffcf9dfd8253d59 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@martintwee.oqapi.nl>
Date: Wed, 26 May 2010 10:08:39 +0200
Subject: [PATCH] Add edit and view url tmpl_vars to mailing loop and refactor
 some variable naming in code.

---
 lib/WebGUI/Mailing/Admin.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/WebGUI/Mailing/Admin.pm b/lib/WebGUI/Mailing/Admin.pm
index f0cd513..e8ffcde 100644
--- a/lib/WebGUI/Mailing/Admin.pm
+++ b/lib/WebGUI/Mailing/Admin.pm
@@ -115,14 +115,14 @@ sub www_view {
 
     return $self->www_settings unless $self->configurationComplete;
 
-    my $letters = $self->getMailables;
+    my $mailables = $self->getMailables;
 
     my @newsletterLoop;
-    foreach my $letter ( @{ $letters } ) {
-        my $letterId = $letter->getId;
+    foreach my $mailing ( @{ $mailables } ) {
+        my $mailingId = $mailing->getId;
 
         my @issues;
-        foreach my $issue ( @{ $letter->getIssues } ) {
+        foreach my $issue ( @{ $mailing->getIssues } ) {
             my $issueId   = $issue->getId;
 
             my @mailings;
@@ -145,7 +145,7 @@ sub www_view {
             push @issues, { 
                 %{ $issue->get },
                 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' ),
                 sendUrl             => '',
                 sendTestUrl         => '',
@@ -154,7 +154,9 @@ sub www_view {
         } 
 
         push @newsletterLoop, {
-            %{ $letter->get },
+            %{ $mailing->get },
+            url         => $mailing->getUrl,
+            editUrl     => $mailing->getUrl( 'func=edit' ),
             issue_loop  => \@issues,
             issueCount  => scalar( @issues ),
         };