summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2012-07-18 10:53:44 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2012-07-18 10:53:44 (GMT)
commit15bbc3d4dbbe1ec20c585a44e93fa1c24748a507 (patch)
tree758cc5ececcd17f079e2f08dc5a7be8004b8afd0
parent64514a25556f0d1884e9e362483c6a363b03cafd (diff)
parent4f70073f0aae109e6f0098a9b62905de857955ac (diff)
downloadroundcubemail-plugins-kolab-15bbc3d4dbbe1ec20c585a44e93fa1c24748a507.tar.gz
Merge branch 'roundcubemail-plugins-kolab-0.7' of ssh://git.kolabsys.com/git/roundcube into roundcubemail-plugins-kolab-0.7
-rw-r--r--plugins/calendar/calendar.php1
-rw-r--r--plugins/calendar/calendar_ui.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index f079746..8c815dd 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1059,6 +1059,7 @@ class calendar extends rcube_plugin
$event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);
return array(
+ '_id' => $event['calendar'] . ':' . $event['id'], // unique identifier for fullcalendar
'start' => gmdate('c', $this->fromGMT($event['start'])), // client treats date strings as they were in users's timezone
'end' => gmdate('c', $this->fromGMT($event['end'])), // so shift timestamps to users's timezone and render a date string
'description' => strval($event['description']),
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 09fdd20..a8eb2b8 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1979,7 +1979,7 @@ function rcube_calendar_ui(settings)
var event = p.update;
event.temp = false;
event.editable = source.editable;
- var existing = fc.fullCalendar('clientEvents', event.id);
+ var existing = fc.fullCalendar('clientEvents', event._id);
if (existing.length) {
$.extend(existing[0], event);
fc.fullCalendar('updateEvent', existing[0]);