diff --git a/docs/upgrades/upgrade_5.3.2-5.3.3.sql b/docs/upgrades/upgrade_5.3.2-5.3.3.sql index 08d1b33a1..3d2cc908d 100644 --- a/docs/upgrades/upgrade_5.3.2-5.3.3.sql +++ b/docs/upgrades/upgrade_5.3.2-5.3.3.sql @@ -1,2 +1,4 @@ insert into webguiVersion values ('5.3.3','upgrade',unix_timestamp()); +delete from international where internationalId=29 and namespace='DataForm' and languageId=1; +insert into international (internationalId,namespace,languageId,message,lastUpdated) values (29,'DataForm',1,'is required',1031515049); diff --git a/lib/WebGUI/Wobject/DataForm.pm b/lib/WebGUI/Wobject/DataForm.pm index a4d36477d..759af3506 100644 --- a/lib/WebGUI/Wobject/DataForm.pm +++ b/lib/WebGUI/Wobject/DataForm.pm @@ -601,11 +601,14 @@ sub www_process { if ($row{status} eq "required" || $row{status} eq "editable") { $value = WebGUI::Macro::filter($value); } - if ($row{status} eq "required" && not defined $value) { + if ($row{status} eq "required" && ($value =~ /^\s$/ || $value eq "" || not defined $value)) { + #if ($row{status} eq "required" && ($value =~ /^\s$/ || $value eq "")) { + #if ($row{status} eq "required" && $value eq "") { push (@errors,{ - "error.message"=>$row{name}." ".WebGUI::International::get(29,$_[0]->get("namespace")), + "error.message"=>$row{name}." ".WebGUI::International::get(29,$_[0]->get("namespace")).".", }); $hadErrors = 1; + delete $var->{entryId}; } unless ($hadErrors) { my ($exists) = WebGUI::SQL->quickArray("select count(*) from DataForm_entryData where DataForm_entryId=$entryId