From 4d55fd82d7793a73235a7740176a41c905f96820 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Tue, 4 Jan 2011 20:29:51 -0600 Subject: [PATCH] move EMSSubmission editSubmission to FormBuilder --- lib/WebGUI/Asset/EMSSubmission.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/WebGUI/Asset/EMSSubmission.pm b/lib/WebGUI/Asset/EMSSubmission.pm index 1f53f95f7..b1c74f18d 100644 --- a/lib/WebGUI/Asset/EMSSubmission.pm +++ b/lib/WebGUI/Asset/EMSSubmission.pm @@ -353,8 +353,8 @@ sub www_editSubmission { } my $asset = $self || $parent; my $url = $asset->getUrl('func=editSubmissionSave'); - my $newform = WebGUI::HTMLForm->new($session,action => $url); - $newform->hidden(name => 'assetId', value => $assetId); + my $newform = WebGUI::FormBuilder->new($session,action => $url); + $newform->addField( "hidden", name => 'assetId', value => $assetId); my $formDescription = $parent->getFormDescription; my @defs = reverse @{__PACKAGE__->definition($session)}; my @fieldNames = qw/title submissionStatus startDate duration seatsAvailable location description/; @@ -401,7 +401,7 @@ sub www_editSubmission { $field->{fieldType} = "readOnly"; } - $newform->dynamicField(%$field); + $newform->addField( "dynamicField", %$field); } else { my $value; # TODO see that the data gets formatted @@ -411,14 +411,14 @@ sub www_editSubmission { } else { $value = $field->{value} || '[ ]'; } - $newform->readOnly( + $newform->addField( "readOnly", label => $field->{label}, value => $value, fieldId => $field->{fieldId}, ); } } - $newform->submit; + $newform->addField( "submit", name => "submit" ); my $title = $asset->get('title'); my $content = $asset->processTemplate({ @@ -426,9 +426,10 @@ sub www_editSubmission { isDynamic => $session->form->get('asJson') || 0, backUrl => $parent->getUrl, pageTitle => $title, - pageForm => $newform->print, + pageForm => $newform->toHtml, commentForm => $self ? $self->getFormattedComments : '', commentFlag => $self ? 1 : 0 , + %{ $newform->toTemplateVars }, },$parent->getParent->get('eventSubmissionTemplateId')); WebGUI::Macro::process( $session, \$content ); if( $params->{asHashRef} ) {