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

Code cleanup for moving form generation out of getFormTemplateVars

Browse source
This commit is contained in:
Colin Kuskie 2010-09-17 09:02:54 -07:00
parent b04aa0a1f3
commit 2609e06a44
1 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -278,7 +278,7 @@ sub _createForm {
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 _getFormFields ($entry, @orderedFields) =head2 _getFormFields ($entry)
Return a list of form fields for this DataForm. Return a list of form fields for this DataForm.
@ -286,10 +286,6 @@ Return a list of form fields for this DataForm.
A WebGUI::AssetCollateral::DataForm::Entry collateral object, with data for an entry in the DataForm. A WebGUI::AssetCollateral::DataForm::Entry collateral object, with data for an entry in the DataForm.
=head3 @orderedFields
Field configurations for this DataForm
=cut =cut
sub _getFormFields { sub _getFormFields {
@ -938,24 +934,14 @@ sub getRecordTemplateVars {
for my $field_form (@fields) { for my $field_form (@fields) {
my ($field, $form) = @{ $field_form }; my ($field, $form) = @{ $field_form };
# need a copy # need a copy
my $value; my $hidden = ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
my $func = $session->form->process('func'); || ($field->{isMailField} && !$self->mailData);
my $ignoreForm = $func eq 'editSave' || $func eq 'editFieldSave';
if ($entry) { # populate Rich Editor field if the field is an HTMLArea
$value = $entry->field( $field->{name} ); if ($field->{type} eq "HTMLArea") {
$field->{htmlAreaRichEditor} = $self->htmlAreaRichEditor ;
} }
elsif (!$ignoreForm && defined (my $formValue = $self->session->form->process($field->{name}))) { my $value = $form->getValueAsHtml;
$value = $formValue;
}
my $hidden
= ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
|| ($field->{isMailField} && !$self->mailData);
# populate Rich Editor field if the field is an HTMLArea
if ($field->{type} eq "HTMLArea") {
$field->{htmlAreaRichEditor} = $self->htmlAreaRichEditor ;
}
$value = $form->getValueAsHtml;
my %fieldProperties = ( my %fieldProperties = (
"form" => $form->toHtml, "form" => $form->toHtml,
"name" => $field->{name}, "name" => $field->{name},