Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix duplicate contacts on the list after contact delete (#4028)

Browse source 
Conflicts:

	plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
This commit is contained in:
Aleksander Machniak 2014-12-05 07:03:20 -05:00
parent b8a631c06d
commit 47700a1b3c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -364,7 +364,7 @@ class rcube_kolab_contacts extends rcube_addressbook
}
}
}
else if (isset($this->dataset)) {
else if (!empty($this->dataset)) {
// get all records count, skip the query if possible
if (!isset($query) || count($this->dataset) < $this->page_size) {
$this->result->count = count($this->dataset) + $this->page_size * ($this->list_page - 1);
@ -373,8 +373,11 @@ class rcube_kolab_contacts extends rcube_addressbook
$this->result->count = $this->storagefolder->count($query);
}
foreach ($this->dataset as $idx => $record) {
$this->result->add($this->_to_rcube_contact($record));
$start_row = $subset < 0 ? $this->page_size + $subset : 0;
$last_row = min($subset != 0 ? $start_row + abs($subset) : $this->page_size, $this->result->count);
for ($i = $start_row; $i < $last_row; $i++) {
$this->result->add($this->_to_rcube_contact($this->dataset[$i]));
}
}