Undefined variable when grid editing a foreign key column

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'QA_4_2'