pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle composite primary keys correctly when deleting rows in the Edit Grid. Fixes #2425

REL-1_X
Khushboo Vashi 2017-06-06 09:58:47 +01:00 committed by Dave Page
parent 4b74a5ff35
commit d21cbb8b1f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@ -726,14 +726,18 @@ define(
// Clear selection model if row primary keys is set to default // Clear selection model if row primary keys is set to default
var row_data = _.clone(collection[selected_rows_list[count]]), var row_data = _.clone(collection[selected_rows_list[count]]),
is_primary_key = _.has(row_data, primary_key_list) && is_primary_key = true;
row_data[0] != undefined ? true : false;
if (primary_key_list.length && // Primary key validation
!is_primary_key && !is_new_row _.each(primary_key_list, function(pk) {
) { if (!(_.has(row_data, pk)) || row_data[pk] == undefined) {
this.selection.setSelectedRows([]); is_primary_key = false;
selected_rows_list = []; }
})
if (primary_key_list.length && !is_primary_key && !is_new_row) {
this.selection.setSelectedRows([]);
selected_rows_list = [];
} }
} }