oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaned up the EMS submission system

Browse source
This commit is contained in:
daviddelikat 2009-11-11 22:29:21 -06:00
parent 9d14e8b420
commit 3b9902e395
11 changed files with 85 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Asset/EMSSubmission.pm
View file

@ -449,7 +449,7 @@ sub www_editSubmission {
}
$newform->submit;
my $title = $assetId eq 'new' ? $i18n_WG->get(99) : $asset->get('title');
my $content = $asset->processStyle(
my $content =
$asset->processTemplate({
errors => $params->{errors} || [],
backUrl => $parent->getUrl,
@ -457,14 +457,16 @@ sub www_editSubmission {
pageForm => $newform->print,
commentForm => $self ? $self->getFormattedComments : '',
commentFlag => $self ? 1 : 0 ,
},$parent->getParent->get('eventSubmissionTemplateId')));
},$parent->getParent->get('eventSubmissionTemplateId'));
WebGUI::Macro::process( $session, \$content );
if( $session->form->get('asJson') ) {
if( $params->{asHashRef} ) {
return { text => $content, title => $title, };
} elsif( $session->form->get('asJson') ) {
$session->http->setMimeType( 'application/json' );
return JSON->new->encode( { text => $content, title => $title, id => $assetId ne 'new' ? $assetId : 'new' . rand } );
} else {
$session->http->setMimeType( 'text/html' );
return $content;
return $asset->processStyle( $content );
}
}