Branch 'roundcubemail-plugins-kolab-3.1' - 2 commits - plugins/tasklist

Thomas Brüderli bruederli at kolabsys.com
Thu Feb 20 09:35:26 CET 2014


 plugins/tasklist/tasklist.js  |    2 +-
 plugins/tasklist/tasklist.php |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit afec77ee5c936fbc3fd41576259ac1a7f0400eb1
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 20 09:32:48 2014 +0100

    Remove false parent_id values with '0'

diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index e96f82f..53597d5 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -659,6 +659,9 @@ class tasklist extends rcube_plugin
         if (in_array($rec['id'], $this->collapsed_tasks))
           $rec['collapsed'] = true;
 
+        if (empty($rec['parent_id']))
+            $rec['parent_id'] = null;
+
         $this->task_titles[$rec['id']] = $rec['title'];
     }
 


commit ea75ebd1fe17f0bf2ac13e15afbf368bc7e292c6
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 20 09:26:15 2014 +0100

    Fix moving tasks to another list from the edit dialog (#2865)

diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index b2829ff..a5cb799 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1307,7 +1307,7 @@ function rcube_tasklist_ui(settings)
 
             // task assigned to a new list
             if (me.selected_task.list && listdata[id] && me.selected_task.list != listdata[id].list) {
-                me.selected_task._fromlist = rec.list;
+                me.selected_task._fromlist = list.id;
             }
 
             me.selected_task.complete = complete.val() / 100;




More information about the commits mailing list