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

More Matrix fixes

Browse source
This commit is contained in:
Yung Han Khoe 2008-11-21 22:46:25 +00:00
parent cdb6ee7f84
commit 9eff3a4b77
3 changed files with 47 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -932,11 +932,13 @@ assetData.revisionDate
",[$attributeId,$result->{assetId}]);
$self->session->errorHandler->warn("fieldType:".$fieldType.", attributeValue: ".$form->process($param).", listingvalue: ".$listingValue);
if(($fieldType eq 'MatrixCompare') && ($listingValue < $form->process($param))){
undef $result->{checked};
#undef $result->{checked};
$result->{checked} = '';
last;
}
elsif(($fieldType ne 'MatrixCompare') && ($form->process($param) ne $listingValue)){
undef $result->{checked};
#undef $result->{checked};
$result->{checked} = '';
last;
}
else{
@ -954,12 +956,12 @@ assetData.revisionDate
}
$result->{assetId} =~ s/-/_____/g;
$result->{url} = "/".$result->{url};
$result->{checkBox} = "<input type='checkbox' name='listingId' value='".$result->{assetId}
."' id='".$result->{assetId}."_checkBox' ";
if($result->{checked}){
$result->{checkBox} .= " checked='checked'";
}
$result->{checkBox} .= " onChange='javascript:compareFormButton()' class='compareCheckBox'>";
#$result->{checkBox} = "<input type='checkbox' name='listingId' value='".$result->{assetId}
# ."' id='".$result->{assetId}."_checkBox' ";
#if($result->{checked}){
# $result->{checkBox} .= " checked='checked'";
#}
#$result->{checkBox} .= " onChange='javascript:compareFormButton()' class='compareCheckBox'>";
}
my $jsonOutput;
@ -1118,6 +1120,7 @@ sub www_search {
$attribute->{extras} = " class='attributeSelect'";
if($attribute->{fieldType} eq 'Combo'){
$attribute->{fieldType} = 'SelectBox';
$attribute->{options} = "blank\n".$attribute->{options};
}
$attribute->{form} = WebGUI::Form::DynamicField->new($self->session,%{$attribute})->toHtml;
push(@attribute_loop,$attribute);