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

Don't sort default task folder to top when it's a sub folder. This will add duplicates to the treelist

Browse source
This commit is contained in:
Thomas Bruederli 2014-08-13 18:02:48 +02:00
parent 81450b627e
commit a2d519a1ae
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
View file

@ -71,10 +71,12 @@ class tasklist_kolab_driver extends tasklist_driver
$folders = kolab_storage::sort_folders(kolab_storage::get_folders('task'));
$this->lists = $this->folders = array();
$delim = $this->rc->get_storage()->get_hierarchy_delimiter();
// find default folder
$default_index = 0;
foreach ($folders as $i => $folder) {
if ($folder->default)
if ($folder->default && strpos($folder->name, $delim) === false)
$default_index = $i;
}
@ -85,7 +87,6 @@ class tasklist_kolab_driver extends tasklist_driver
array_unshift($folders, $default_folder);
}
$delim = $this->rc->get_storage()->get_hierarchy_delimiter();
$prefs = $this->rc->config->get('kolab_tasklists', array());
foreach ($folders as $folder) {

3
plugins/tasklist/tasklist.js
View file

@ -135,9 +135,8 @@ function rcube_tasklist_ui(settings)
{
// initialize task list selectors
for (var id in me.tasklists) {
if (me.tasklists[id].editable && (!me.selected_list || (me.tasklists[id].active && !me.tasklists[me.selected_list].active))) {
if (me.tasklists[id].editable && (!me.selected_list || me.tasklists[id].default || (me.tasklists[id].active && !me.tasklists[me.selected_list].active))) {
me.selected_list = id;
break;
}
}