Fix selection of calendar in event/task editors

Fixes #3049 Fixes #3050
2015-01-06 13:59:20 -05:00 · 2015-01-06 13:59:20 -05:00 · dd6dd7251c
parent 24c6c8c91d
commit dd6dd7251c
3 changed files with 4 additions and 1 deletions
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@ -1428,7 +1428,8 @@ iRANGE(2);

 - (void) setComponentCalendar: (SOGoAppointmentFolder *) _componentCalendar
 {
-  ASSIGN(componentCalendar, _componentCalendar);
+  if (_componentCalendar)
+    ASSIGN(componentCalendar, _componentCalendar);
 }

 /* priorities */
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@ -8,6 +8,7 @@
  xmlns:rsrc="OGo:url"
  xmlns:label="OGo:label"
  className="UIxComponentEditor"
+  componentCalendar="componentCalendar"
  eventIsReadOnly="eventIsReadOnly"
  var:component="event"
  var:rsvpURL="rsvpURL"
--- a/UI/Templates/SchedulerUI/UIxTaskEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
@ -8,6 +8,7 @@
  xmlns:rsrc="OGo:url"
  xmlns:label="OGo:label"
  className="UIxComponentEditor"
+  componentCalendar="componentCalendar"
  eventIsReadOnly="eventIsReadOnly"
  var:component="todo"
  var:saveURL="saveURL">