From 0e82552f27fab353ff3ef4499accc56898cfda96 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 3 Oct 2011 13:40:04 -0700
Subject: [PATCH] Make a custom getEditTemplate method to handle getting
 information from the parent Matrix.  Fix class=>className form code, and
 adding buttons.

---
 lib/WebGUI/Asset/MatrixListing.pm | 56 ++++++++++++++-----------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
index b51c44eee..6ab405305 100644
--- a/lib/WebGUI/Asset/MatrixListing.pm
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -217,7 +217,7 @@ sub getEditForm {
             value          => 'new',
         );
         $form->addField( "hidden", 
-            name           => 'class',
+            name           => 'className',
             value          => 'WebGUI::Asset::MatrixListing',
         );
     }
@@ -324,18 +324,39 @@ sub getEditForm {
     }
 
     my $buttons = $form->addField( "ButtonGroup", name => "saveButtons", rowClass => "saveButtons" );
-    $buttons->addButton( "Submit", name => "send" );
-    $buttons->addButton( "Button", 
+    $buttons->addButton( "Submit", { name => "send", });
+    $buttons->addButton( "Button", {
         name => "cancel", 
         value => $i18n->get('cancel', 'WebGUI'),
         extras => q{onclick="history.go(-1);" class="backwardButton"},
-    );
+    } );
 
     return $form;
 }
 
 #-------------------------------------------------------------------
 
+=head2 getEditTemplate ( )
+
+Override the base method to get the template from the parent Matrix asset.
+
+=cut
+
+sub getEditTemplate {
+    my $self = shift;
+    my $var         = $self->get;
+    my $matrix      = $self->getParent;
+    my $template    = eval { WebGUI::Asset->newById($self->session, $matrix->get('editListingTemplateId')); };
+    # TODO: Change to FormBuilder
+    $var->{form}    = $self->getEditForm->toHtml;
+    $self->session->log->warn($var->{form});
+    $template->setParam(%{ $var });
+    $template->style($matrix->getStyleTemplateId);
+    return $template;
+}
+
+#-------------------------------------------------------------------
+
 =head2 hasRated ( )
 
 Returns whether the user has already rated this listing or not.
@@ -813,33 +834,6 @@ sub www_deleteStickied {
 
 #-------------------------------------------------------------------
 
-=head2 www_edit ( )
-
-Web facing method which is the default edit page
-
-=cut
-
-sub www_edit {
-    my $self = shift;
-    my $i18n = WebGUI::International->new($self->session, "Asset_MatrixListing");
-
-    if($self->session->form->process('func') eq 'add'){
-        return $self->session->privilege->noAccess() unless $self->getParent->canAddMatrixListing();
-    }else{
-        return $self->session->privilege->insufficient() unless $self->canEdit;
-        return $self->session->privilege->locked() unless $self->canEditIfLocked;
-    }
-
-    my $var         = $self->get;
-    my $matrix      = $self->getParent;
-    # TODO: Change to FormBuilder
-    $var->{form}    = $self->getEditForm->toHtml;
-        
-    return $matrix->processStyle($self->processTemplate($var,$matrix->get("editListingTemplateId")));
-}
-
-#-------------------------------------------------------------------
-
 =head2 www_getAttributes ( )
 
 Gets a listings attributes grouped by category as json.