2 commits - plugins/tasklist

[Thomas Brüderli]

 plugins/tasklist/tasklist.js |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 166b43581554160a3d32ff1843d0240ad9359236
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Aug 1 16:07:30 2012 +0200

    Fix edit form tabs selector

diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index b33322c..55f25a5 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -847,7 +847,7 @@ function rcube_tasklist_ui(settings)
         $('#taskedit-tab-attachments')[(list.attachments?'show':'hide')]();
 
         // activate the first tab
-        $('#eventtabs').tabs('select', 0);
+        $('#taskedit').tabs('select', 0);
 
         // define dialog buttons
         var buttons = {};


commit 3283f12d100094b82850160b2141eea6304135b0
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Aug 1 16:05:13 2012 +0200

    Make sure child tasks are saved to the same list as their parent

diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index e5a874a..b33322c 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -802,7 +802,7 @@ function rcube_tasklist_ui(settings)
         var recstarttime = $('#edit-starttime').val(rec.starttime || '');
         var complete = $('#edit-completeness').val((rec.complete || 0) * 100);
         completeness_slider.slider('value', complete.val());
-        var tasklist = $('#edit-tasklist').val(rec.list || 0); // .prop('disabled', rec.parent_id ? true : false);
+        var tasklist = $('#edit-tasklist').val(rec.list || 0).prop('disabled', rec.parent_id ? true : false);
 
         // tag-edit line
         var tagline = $(rcmail.gui_objects.edittagline).empty();
@@ -1014,7 +1014,8 @@ function rcube_tasklist_ui(settings)
      */
     function add_childtask(id)
     {
-        task_edit_dialog(null, 'new', { parent_id:id });
+        var rec = listdata[id];
+        task_edit_dialog(null, 'new', { parent_id:id, list:rec.list });
     }
 
     /**