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

Merry Xmas bugfix #2:

Browse source
This commit is contained in:
Martin Kamerbeek 2006-12-26 18:20:39 +00:00
parent f008f68bfc
commit a782df32fb
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -16,6 +16,7 @@
- fix: Disobedient Forum Rich Editor - fix: Disobedient Forum Rich Editor
- fix: SQLForm - fixed a bug where regexes would sometimes be ignored (Martin - fix: SQLForm - fixed a bug where regexes would sometimes be ignored (Martin
Kamerbeek / Oqapi) Kamerbeek / Oqapi)
- fix: SQLForm - checkList/varchar (Martin Kamerbeek / Oqapi)
7.3.2 7.3.2
- fix: Calendar and Event now have printable templates and URL parameters. - fix: Calendar and Event now have printable templates and URL parameters.

10
lib/WebGUI/Asset/Wobject/SQLForm.pm
View file

@ -2340,10 +2340,9 @@ sub _getFieldValue {
} }
#### This might break? #### #### This might break? ####
if ($field->{canHaveMultipleValues} && !$readOnly) { if ($field->{canHaveMultipleValues}) {
$fieldValue = [ $recordValues->{$field->{fieldName}} ]; $fieldValue = [ split(/\n/, $recordValues->{$field->{fieldName}}) ];
$fieldValue = [ $self->session->request->param($field->{fieldName}) ] if (defined $self->session->form->process($field->{fieldName})); $fieldValue = [ $self->session->request->param($field->{fieldName}) ] if (defined $self->session->form->process($field->{fieldName}));
$fieldValue = join(', ', @$fieldValue) if ($readOnly);
} }
# Handle file uploads # Handle file uploads
@ -2398,7 +2397,7 @@ sub _getFormElement {
$fieldValue = $self->_getFieldValue($field, $recordValues, $readOnly); $fieldValue = $self->_getFieldValue($field, $recordValues, $readOnly);
# Resolve value to key in case of read only and key/value pairs # Resolve value to key in case of read only and key/value pairs
$fieldValue = $field->{allOptions}->{$fieldValue} if ($field->{hasOptions} && $readOnly); $fieldValue = join(', ', @{$field->{allOptions}}{@$fieldValue}) if ($field->{hasOptions} && $readOnly);
$maxLength = $field->{maxFieldLength} || $allowedDbFieldTypes->{$field->{dbFieldType}}->{maxLength}; $maxLength = $field->{maxFieldLength} || $allowedDbFieldTypes->{$field->{dbFieldType}}->{maxLength};
# Construct the form element # Construct the form element
@ -4116,7 +4115,8 @@ my $value;
$fieldProperties->{$_} = $self->_getFieldProperties($_) unless (exists $fieldProperties->{$_}); $fieldProperties->{$_} = $self->_getFieldProperties($_) unless (exists $fieldProperties->{$_});
if ($fieldProperties->{$_}->{hasOptions}) { if ($fieldProperties->{$_}->{hasOptions}) {
$value = $fieldProperties->{$_}->{allOptions}->{$row{$fieldProperties->{$_}->{fieldName}}}; my @options = split(/\n/, $row{$fieldProperties->{$_}->{fieldName}});
$value = join(', ', @{$fieldProperties->{$_}->{allOptions}}{@options});
} else { } else {
$value = $row{$fieldProperties->{$_}->{fieldName}}; $value = $row{$fieldProperties->{$_}->{fieldName}};
} }