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

more bug fixes

Browse source
This commit is contained in:
JT Smith 2006-01-13 19:32:26 +00:00
parent 3c0c47014c
commit a6e5450b64
12 changed files with 55 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ sub _createField {
my %param;
$param{name} = $data->{name};
$param{name} = "field_".$data->{sequenceNumber} if ($param{name} eq ""); # Empty fieldname not allowed
$self->session->form->process("$param{name}") =~ s/\^.*?\;//gs ; # remove macro's from user input
$self->session->form->process($param{name}) =~ s/\^.*?\;//gs ; # remove macro's from user input
$param{value} = $data->{value};
$param{size} = $data->{width};
$param{rows} = $data->{rows} || 5;
@ -44,7 +44,7 @@ sub _createField {
}
if (isIn($data->{type},qw(selectList checkList))) {
my @defaultValues;
if ($self->session->form->process("$param{name}")) {
if ($self->session->form->process($param{name})) {
@defaultValues = $self->session->form->selectList($param{name});
} else {
foreach (split(/\n/, $data->{value})) {
@ -424,7 +424,7 @@ sub getRecordTemplateVars {
my @fields;
my $sth = $self->session->db->read("$select from DataForm_field as a $join $where and a.DataForm_tabId=".$self->session->db->quote($tab{DataForm_tabId})." order by a.sequenceNumber");
while (%data = $sth->hash) {
my $formValue = $self->session->form->process("$data{name}");
my $formValue = $self->session->form->process($data{name});
if ((not exists $data{value}) && $self->session->form->process("func") ne "editSave" && $self->session->form->process("func") ne "editFieldSave" && defined $formValue) {
$data{value} = $formValue;
$data{value} = $self->session->datetime->setToEpoch($data{value}) if ($data{type} eq "date");
@ -468,7 +468,7 @@ sub getRecordTemplateVars {
my @fields;
my $sth = $self->session->db->read("$select from DataForm_field as a $join $where and a.DataForm_tabId = 0 order by a.sequenceNumber");
while (%data = $sth->hash) {
my $formValue = $self->session->form->process("$data{name}");
my $formValue = $self->session->form->process($data{name});
if ((not exists $data{value}) && $self->session->form->process("func") ne "editSave" && $self->session->form->process("func") ne "editFieldSave" && defined $formValue) {
$data{value} = $formValue;
$data{value} = $self->session->datetime->setToEpoch($data{value}) if ($data{type} eq "date");