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

Only auto-add organizer when saving the first time; js bugfix

Browse source
This commit is contained in:
Thomas 2011-07-26 08:55:30 +02:00
parent 3fabdefc77
commit b242b551ba
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/calendar/calendar.php
View file

@ -473,14 +473,14 @@ class calendar extends rcube_plugin
$event['attendees'][] = array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email']); $event['attendees'][] = array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email']);
} }
$this->prepare_event($event); $this->prepare_event($event, $action);
if ($success = $this->driver->new_event($event)) if ($success = $this->driver->new_event($event))
$this->cleanup_event($event); $this->cleanup_event($event);
$reload = true; $reload = true;
break; break;
case "edit": case "edit":
$this->prepare_event($event); $this->prepare_event($event, $action);
if ($success = $this->driver->edit_event($event)) if ($success = $this->driver->edit_event($event))
$this->cleanup_event($event); $this->cleanup_event($event);
$reload = true; $reload = true;
@ -1149,7 +1149,7 @@ class calendar extends rcube_plugin
/** /**
* Prepares new/edited event properties before save * Prepares new/edited event properties before save
*/ */
private function prepare_event(&$event) private function prepare_event(&$event, $action)
{ {
$eventid = $event['calendar'].':'.$event['id']; $eventid = $event['calendar'].':'.$event['id'];
@ -1181,7 +1181,7 @@ class calendar extends rcube_plugin
if (!$organizer && $owner !== false) { if (!$organizer && $owner !== false) {
$event['attendees'][$i]['role'] = 'ORGANIZER'; $event['attendees'][$i]['role'] = 'ORGANIZER';
} }
else if (!$organizer && $identity['email']) { else if (!$organizer && $identity['email'] && $action == 'new') {
array_unshift($event['attendees'], array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email'], 'status' => 'ACCEPTED')); array_unshift($event['attendees'], array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email'], 'status' => 'ACCEPTED'));
} }
} }

2
plugins/calendar/calendar_ui.js
View file

@ -1142,7 +1142,7 @@ function rcube_calendar_ui(settings)
var check_freebusy_status = function(icon, email, event) var check_freebusy_status = function(icon, email, event)
{ {
var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { freebusy:false }; var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { freebusy:false };
if (!calendar) { if (!calendar.freebusy) {
$(icon).removeClass().addClass('availabilityicon unknown'); $(icon).removeClass().addClass('availabilityicon unknown');
return; return;
} }