2 commits - plugins/tasklist

[Thomas Brüderli]

 plugins/tasklist/drivers/database/SQL/mysql.sql                |    2 +-
 plugins/tasklist/drivers/database/tasklist_database_driver.php |    4 ++--
 plugins/tasklist/tasklist.js                                   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f971d25843ebe0a7546627e0521cde9fcc737b57
Merge: a6118c7 61eac55
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Sun Aug 5 19:32:41 2012 +0200

    Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube



commit a6118c7e444ec7a12c7d710a4d4cfdf13db500fe
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Sun Aug 5 19:32:20 2012 +0200

    Fix task insert query; adjust dialog height

diff --git a/plugins/tasklist/drivers/database/SQL/mysql.sql b/plugins/tasklist/drivers/database/SQL/mysql.sql
index 6906ab6..b6fd2ce 100644
--- a/plugins/tasklist/drivers/database/SQL/mysql.sql
+++ b/plugins/tasklist/drivers/database/SQL/mysql.sql
@@ -36,7 +36,7 @@ CREATE TABLE `tasks` (
   `starttime` varchar(5) DEFAULT NULL,
   `flagged` tinyint(4) NOT NULL DEFAULT '0',
   `complete` float NOT NULL DEFAULT '0',
-  `alarms` varchar(255) NOT NULL,
+  `alarms` varchar(255) DEFAULT NULL,
   `recurrence` varchar(255) DEFAULT NULL,
   `organizer` varchar(255) DEFAULT NULL,
   `attendees` text,
diff --git a/plugins/tasklist/drivers/database/tasklist_database_driver.php b/plugins/tasklist/drivers/database/tasklist_database_driver.php
index 2b3ff90..e2c9687 100644
--- a/plugins/tasklist/drivers/database/tasklist_database_driver.php
+++ b/plugins/tasklist/drivers/database/tasklist_database_driver.php
@@ -440,8 +440,8 @@ class tasklist_database_driver extends tasklist_driver
         $notify_at = $this->_get_notification($prop);
         $result = $this->rc->db->query(sprintf(
             "INSERT INTO " . $this->db_tasks . "
-             (tasklist_id, uid, parent_id, created, changed, title, date, time, starttime, starttime, description, tags, alarms, notify)
-             VALUES (?, ?, ?, %s, %s, ?, ?, ?, ?, ?)",
+             (tasklist_id, uid, parent_id, created, changed, title, date, time, startdate, starttime, description, tags, alarms, notify)
+             VALUES (?, ?, ?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
              $this->rc->db->now(),
              $this->rc->db->now()
             ),
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index a08b00b..3727d08 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -975,7 +975,7 @@ function rcube_tasklist_ui(settings)
               $dialog.dialog('destroy').remove();
           },
           buttons: buttons,
-          minHeight: 340,
+          minHeight: 460,
           minWidth: 500,
           width: 580
         }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE