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

fixed: DataForm acknowledgement screen shows incorrect value for Date/Time fields

Browse source
This commit is contained in:
Graham Knop 2008-08-14 17:23:14 +00:00
parent 7f095970c6
commit 7be08540c1
4 changed files with 5 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

@ -1,4 +1,5 @@
7.5.20
- fixed: DataForm acknowledgement screen shows incorrect value for Date/Time fields
- fixed: Some multipart mail messages have parts chosen incorrectly
- fixed: File Pile doesn't respect edit permissions of parent asset
- fixed: shortcut overrides new value column doesn't show macros as unparsed

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

@ -598,6 +598,7 @@ sub getListUrl {
sub getRecordTemplateVars {
my $self = shift;
my $var = shift;
my $entryData = shift;
my $i18n = WebGUI::International->new($self->session,"Asset_DataForm");
$var->{"back.url"} = $self->getUrl;
$var->{"back.label"} = $i18n->get(18);
@ -607,7 +608,6 @@ sub getRecordTemplateVars {
my $fields = $self->getFieldConfig;
# If we have an entry id, we're doing this based on existing data
my $entry;
my $entryData;
if ($var->{entryId}) {
$var->{"form.start"} .= WebGUI::Form::hidden($self->session,{name=>"entryId",value=>$var->{entryId}});
$entry = $self->getCollateral("DataForm_entry","DataForm_entryId",$var->{entryId});

2
lib/WebGUI/Form/Control.pm
View file

@ -447,7 +447,7 @@ Returns the value rendered suitably in HTML. This is useful for forms that are r
sub getValueAsHtml {
my $self = shift;
return $self->getDefaultValue(@_);
return $self->getOriginalValue(@_);
}
#-------------------------------------------------------------------

6
lib/WebGUI/Form/DateTime.pm
View file

@ -178,10 +178,8 @@ Return the date in a human readable format.
sub getValueAsHtml {
my ($self) = @_;
# This should probably be rewritten as a cascading ternary
if (!$self->get("defaultValue")
|| $self->get("defaultValue") =~ m/^\d+$/
|| !$self->get("value")
|| $self->get("value") =~ m/^\d+$/) {
my $formatValue = $self->getDefaultValue || $self->getOriginalValue;
if (!$formatValue || $formatValue =~ m/^\d+$/) {
return $self->session->datetime->epochToHuman($self->getOriginalValue,"%z %Z");
}
else {