extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deleting multiple rows by storing grid row ID first, otherwise grid row IDs change as we delete rows

Browse Source
This commit is contained in:
Nathan Gray 2014-01-22 16:43:31 +00:00
parent b4ad250438
commit c5e1ed231a
1 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
etemplate/js/et2_extension_nextmatch.js
View File

@ -437,6 +437,52 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
var list = this.options.settings.get_rows.split('.', 2); var list = this.options.settings.get_rows.split('.', 2);
if (list.length < 2) list = this.options.settings.get_rows.split('_', 2); // support "app_something::method" if (list.length < 2) list = this.options.settings.get_rows.split('_', 2); // support "app_something::method"
var app = list[0]; var app = list[0];
if(_type == "delete")
{
// Record current & next index
var uid = app + "::" + _row_ids[0];
var entry = this.controller._selectionMgr._getRegisteredRowsEntry(uid);
var next = entry.ao.getNext(_row_ids.length-1);
if(next == null || !next.id)
{
// No next, select previous
next = entry.ao.getPrevious(1);
}
// Select next row
if(next && next.id)
{
this.controller._selectionMgr._handleSelect(next.id);
}
// Stop automatic updating
this.dataview.grid.doInvalidate = false;
// Collect IDs
var grid_IDs = [];
for(var i = 0; i < _row_ids.length; i++)
{
uid = app + "::" + _row_ids[i];
entry = this.controller._selectionMgr._getRegisteredRowsEntry(uid);
grid_IDs.push(entry.idx);
// Stop caring about this ID
this.egw().dataDeleteUID(uid);
}
// Grid indexes change as we delete rows, so go from bottom
// Sort to make sure they're in numeric order
grid_IDs.sort(function(a,b){return b-a;});
for(var i = 0; i < grid_IDs.length; i++)
{
// Blank the row
this.dataview.grid.deleteRow(grid_IDs[i]);
}
// Update the count
var total = this.dataview.grid._total - _row_ids.length;
this.dataview.grid.setTotalCount(total);
// Re-enable automatic updating
this.dataview.grid.doInvalidate = true;
}
id_loop: id_loop:
for(var i = 0; i < _row_ids.length; i++) for(var i = 0; i < _row_ids.length; i++)
@ -453,30 +499,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
} }
break; break;
case "delete": case "delete":
// Record current & next index // Handled above, more code to execute after loop
var entry = this.controller._selectionMgr._getRegisteredRowsEntry(uid);
var next = entry.ao.getNext(1);
if(next == null || !next.id)
{
// No next, select previous
next = entry.ao.getPrevious(1);
}
// Select next row
if(next && next.id)
{
this.controller._selectionMgr._handleSelect(next.id);
}
// Stop automatic updating
this.dataview.grid.doInvalidate = false;
// Blank the row
this.dataview.grid.deleteRow(entry.idx);
// Stop caring about this ID
this.egw().dataDeleteUID(uid);
// Update the count
var total = this.dataview.grid._total - 1;
this.dataview.grid.setTotalCount(total);
// Re-enable automatic updating
this.dataview.grid.doInvalidate = true;
break; break;
case "edit": case "edit":
case "add": case "add":