Fix incorrect variable names for joined fields in filter expressions

fixes #11779
This commit is contained in:
Gunnar Beutner 2016-05-12 10:24:15 +02:00
parent fc889eb9ad
commit de1b70cf44
1 changed files with 4 additions and 1 deletions

View File

@ -123,7 +123,10 @@ bool FilterUtility::EvaluateFilter(ScriptFrame& frame, Expression *filter,
Object::Ptr joinedObj = target->NavigateField(fid); Object::Ptr joinedObj = target->NavigateField(fid);
vars->Set(field.Name, joinedObj); if (field.NavigationName)
vars->Set(field.NavigationName, joinedObj);
else
vars->Set(field.Name, joinedObj);
} }
return Convert::ToBool(filter->Evaluate(frame)); return Convert::ToBool(filter->Evaluate(frame));