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

Fix task reminder saving/rendering (#1680)

Browse source
This commit is contained in:
Thomas Bruederli 2013-03-06 15:47:30 +01:00
parent 8002a76573
commit b11f2820ad
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/tasklist/drivers/database/tasklist_database_driver.php
View file

@ -656,7 +656,7 @@ class tasklist_database_driver extends tasklist_driver
private function _get_notification($task) private function _get_notification($task)
{ {
if ($task['alarms'] && $task['complete'] < 1 || strpos($task['alarms'], '@') !== false) { if ($task['alarms'] && $task['complete'] < 1 || strpos($task['alarms'], '@') !== false) {
$alarm = libcalendaring::get_next_alarm($task); $alarm = libcalendaring::get_next_alarm($task, 'task');
if ($alarm['time'] && $alarm['action'] == 'DISPLAY') if ($alarm['time'] && $alarm['action'] == 'DISPLAY')
return date('Y-m-d H:i:s', $alarm['time']); return date('Y-m-d H:i:s', $alarm['time']);

5
plugins/tasklist/tasklist.js
View file

@ -100,7 +100,6 @@ function rcube_tasklist_ui(settings)
var Q = this.quote_html; var Q = this.quote_html;
var text2html = this.text2html; var text2html = this.text2html;
var event_date_text = this.event_date_text; var event_date_text = this.event_date_text;
var format_datetime = this.format_datetime;
var parse_datetime = this.parse_datetime; var parse_datetime = this.parse_datetime;
var date2unixtime = this.date2unixtime; var date2unixtime = this.date2unixtime;
var fromunixtime = this.fromunixtime; var fromunixtime = this.fromunixtime;
@ -1019,8 +1018,8 @@ function rcube_tasklist_ui(settings)
if (alarm[0].match(/@(\d+)/)) { if (alarm[0].match(/@(\d+)/)) {
var ondate = fromunixtime(parseInt(RegExp.$1)); var ondate = fromunixtime(parseInt(RegExp.$1));
$('#taskedit select.edit-alarm-offset').val('@'); $('#taskedit select.edit-alarm-offset').val('@');
$('#taskedit input.edit-alarm-date').val(format_datetime(ondate, 1)); $('#taskedit input.edit-alarm-date').val(me.format_datetime(ondate, 1));
$('#taskedit input.edit-alarm-time').val(format_datetime(ondate, 2)); $('#taskedit input.edit-alarm-time').val(me.format_datetime(ondate, 2));
} }
else if (alarm[0].match(/([-+])(\d+)([MHD])/)) { else if (alarm[0].match(/([-+])(\d+)([MHD])/)) {
$('#taskedit input.edit-alarm-value').val(RegExp.$2); $('#taskedit input.edit-alarm-value').val(RegExp.$2);