Ensure newly added rows cannot be editted until we have key values. Fixes #RM2886

This commit is contained in:
Murtuza Zabuawala 2017-11-22 16:38:18 +00:00 committed by Dave Page
parent f0db93cefd
commit 1bc318f091

View File

@ -668,12 +668,14 @@ define('tools.querytool', [
} }
} }
} }
// Disable rows having default values // Disable rows having default values
if (!_.isUndefined(self.handler.rows_to_disable) && if (!_.isUndefined(self.handler.rows_to_disable) &&
_.indexOf(self.handler.rows_to_disable, i) !== -1 self.handler.rows_to_disable.length > 0 &&
) { _.indexOf(self.handler.rows_to_disable, i) !== -1) {
cssClass += ' disabled_row'; cssClass += ' disabled_row';
} }
return {'cssClasses': cssClass}; return {'cssClasses': cssClass};
}; };
@ -825,16 +827,17 @@ define('tools.querytool', [
// so that cell edit is enabled for that row. // so that cell edit is enabled for that row.
var grid = args.grid, var grid = args.grid,
row_data = grid.getDataItem(args.row), row_data = grid.getDataItem(args.row),
is_primary_key = _.all( is_primary_key = self.primary_keys &&
_.values( _.all(
_.pick( _.values(
row_data, self.primary_keys _.pick(
) row_data, self.primary_keys
), )
function (val) { ),
return val != undefined function (val) {
} return val != undefined
); }
);
// temp_new_rows is available only for view data. // temp_new_rows is available only for view data.
if (is_primary_key && self.handler.temp_new_rows) { if (is_primary_key && self.handler.temp_new_rows) {