Fix incorrect variable names for joined fields in filter expressions

fixes #11779

diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp
index d5e8cd1b0f5511a5c4e3ae5a7b7713b0435d00c1..d9f50e7bcab1920a08b0dcd75fc8371f7ce3eac0 100644 (file)
--- a/lib/remote/filterutility.cpp
+++ b/lib/remote/filterutility.cpp
@@ -123,7 +123,10 @@ bool FilterUtility::EvaluateFilter(ScriptFrame& frame, Expression *filter,
 
                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));