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

Fix deleting addressbook folder, disable some commands after delete

Browse source
This commit is contained in:
Aleksander Machniak 2013-06-07 10:39:35 +02:00
parent aab2d91b17
commit b3b04f42b1
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/kolab_addressbook/kolab_addressbook.js
View file

@ -89,7 +89,7 @@ rcube_webmail.prototype.book_delete_done = function(id, recur)
var n, groups = this.env.contactgroups,
sources = this.env.address_sources,
olddata = sources[id];
alert(id);
this.treelist.remove(id);
for (n in groups)
@ -104,8 +104,11 @@ rcube_webmail.prototype.book_delete_done = function(id, recur)
if (recur)
return;
this.enable_command('group-create', 'book-edit', 'book-delete', false);
// remove subfolders
olddata.realname += this.env.delimiter;
alert(olddata.realname)
for (n in sources)
if (sources[n].realname && sources[n].realname.indexOf(olddata.realname) == 0)
this.book_delete_done(n, true);

4
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -495,9 +495,13 @@ class kolab_addressbook extends rcube_plugin
$folder = trim(get_input_value('_source', RCUBE_INPUT_GPC, true, 'UTF7-IMAP'));
if (kolab_storage::folder_delete($folder)) {
$storage = $this->rc->get_storage();
$delimiter = $storage->get_hierarchy_delimiter();
$this->rc->output->show_message('kolab_addressbook.bookdeleted', 'confirmation');
$this->rc->output->set_env('pagecount', 0);
$this->rc->output->command('set_rowcount', rcmail_get_rowcount_text(new rcube_result_set()));
$this->rc->output->command('set_env', 'delimiter', $delimiter);
$this->rc->output->command('list_contacts_clear');
$this->rc->output->command('book_delete_done', kolab_storage::folder_id($folder));
}