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

fixed bugs where required fields were not actually required.

Browse source
This commit is contained in:
JT Smith 2003-06-17 03:35:51 +00:00
parent 084827708f
commit c7cbbe085f
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/upgrades/upgrade_5.3.2-5.3.3.sql
View file

@ -1,2 +1,4 @@
insert into webguiVersion values ('5.3.3','upgrade',unix_timestamp()); 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);

7
lib/WebGUI/Wobject/DataForm.pm
View file

@ -601,11 +601,14 @@ sub www_process {
if ($row{status} eq "required" || $row{status} eq "editable") { if ($row{status} eq "required" || $row{status} eq "editable") {
$value = WebGUI::Macro::filter($value); $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,{ 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; $hadErrors = 1;
delete $var->{entryId};
} }
unless ($hadErrors) { unless ($hadErrors) {
my ($exists) = WebGUI::SQL->quickArray("select count(*) from DataForm_entryData where DataForm_entryId=$entryId my ($exists) = WebGUI::SQL->quickArray("select count(*) from DataForm_entryData where DataForm_entryId=$entryId