BZ1020984 - GDT: when adding condition, user must reselect calculation type
(cherry picked from commit e20a88bf8bb04850104ca2cead78aa6cd591f1de)