mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-24 15:48:55 +01:00
Fix d-n-d indicator shows wrong number of selected rows if it's a select all
This commit is contained in:
parent
05255047ed
commit
488eabe896
@ -101,6 +101,12 @@ function egwDragActionImplementation()
|
|||||||
var itemLabel = egw.lang(egw.link_get_registry(egw.app_name(),_selected.length > 1?'entries':'entry')||egw.app_name());
|
var itemLabel = egw.lang(egw.link_get_registry(egw.app_name(),_selected.length > 1?'entries':'entry')||egw.app_name());
|
||||||
|
|
||||||
var index = 0;
|
var index = 0;
|
||||||
|
|
||||||
|
// Take select all into account when counting number of rows, because they may not be
|
||||||
|
// in _selected object
|
||||||
|
var pseudoNumRows = (_selected[0] && _selected[0]._context._selectionMgr._selectAll) ?
|
||||||
|
_selected[0]._context._selectionMgr._total : _selected.length;
|
||||||
|
|
||||||
for (var i = 0; i < _selected.length;i++)
|
for (var i = 0; i < _selected.length;i++)
|
||||||
{
|
{
|
||||||
var row = jQuery(_selected[i].iface.getDOMNode()).clone();
|
var row = jQuery(_selected[i].iface.getDOMNode()).clone();
|
||||||
@ -117,12 +123,12 @@ function egwDragActionImplementation()
|
|||||||
.addClass('et2_egw_action_ddHelper_itemsCnt')
|
.addClass('et2_egw_action_ddHelper_itemsCnt')
|
||||||
.appendTo(div);
|
.appendTo(div);
|
||||||
|
|
||||||
spanCnt.text(_selected.length +' '+ itemLabel);
|
spanCnt.text(pseudoNumRows +' '+ itemLabel);
|
||||||
// Number of not shown rows
|
// Number of not shown rows
|
||||||
var restRows = _selected.length - maxRows;
|
var restRows = pseudoNumRows - maxRows;
|
||||||
if (restRows)
|
if (restRows)
|
||||||
{
|
{
|
||||||
moreRow.text((_selected.length - maxRows) +' '+egw.lang('more %1 selected ...', itemLabel));
|
moreRow.text((pseudoNumRows - maxRows) +' '+egw.lang('more %1 selected ...', itemLabel));
|
||||||
}
|
}
|
||||||
table.append(moreRow);
|
table.append(moreRow);
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user