From 6421f5f6e23f1f9d529921690c5fb31f80695747 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 22 Apr 2015 10:58:26 +0200 Subject: [PATCH] Fix tasklist selection when saving task (#4182) --- plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php | 8 +++++++- plugins/tasklist/tasklist.js | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php index 0723eca0..de702677 100644 --- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php +++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php @@ -1361,8 +1361,14 @@ class tasklist_kolab_driver extends tasklist_driver { $this->_parse_id($task); $list_id = $task['list']; - if (!$list_id || !($folder = $this->get_folder($list_id))) + if (!$list_id || !($folder = $this->get_folder($list_id))) { + raise_error(array( + 'code' => 600, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Invalid list identifer to save taks: " . var_dump($list_id, true)), + true, false); return false; + } // email links and tags are stored separately $links = $task['links']; diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js index 5e343334..62150bca 100644 --- a/plugins/tasklist/tasklist.js +++ b/plugins/tasklist/tasklist.js @@ -2421,9 +2421,10 @@ function rcube_tasklist_ui(settings) data._status_before = me.selected_task.status + ''; // copy form field contents into task object to save - $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, status:taskstatus, list:tasklist }, function(key,input){ + $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, status:taskstatus }, function(key,input){ data[key] = input.val(); }); + data.list = tasklist.find('option:selected').val(); data.tags = []; data.attachments = []; data.attendees = task_attendees;