fix for external invitations
authorsstamer <s.stamer@metaways.de>
Tue, 9 Sep 2014 15:17:14 +0000 (17:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Sep 2014 08:37:06 +0000 (10:37 +0200)
Change-Id: I3c1114863a393962f8c13c47a99da2afe0a37272
Reviewed-on: http://gerrit.tine20.com/customers/1116
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
tine20/Calendar/Frontend/iMIP.php
tine20/Calendar/js/iMIPDetailsPanel.js

index 1fa6466..b9995db 100644 (file)
@@ -332,6 +332,8 @@ class Calendar_Frontend_iMIP
             if (! $existingEvent) {
                 // organizer has an account but no event exists, it seems that event was created from a non-caldav client
                 // do not send notifications in this case + create event in context of organizer
+                if (Tinebase_Core::isLogLevel(Zend_Log::INFO)) Tinebase_Core::getLogger()->info(__METHOD__ . '::' . __LINE__
+                        . ' Organizer has an account but no event exists!');
                 return; // not clear how to create in the organizers context...
                 $sendNotifications = Calendar_Controller_Event::getInstance()->sendNotifications(FALSE);
                 $existingEvent = Calendar_Controller_MSEventFacade::getInstance()->create($_iMIP->getEvent());
index a9a1764..e90c9d1 100644 (file)
@@ -125,7 +125,6 @@ Tine.Calendar.iMIPDetailsPanel = Ext.extend(Tine.Calendar.EventDetailsPanel, {
             this.iMIPrecord.set('event', Tine.Calendar.backend.recordReader({
                 responseText: Ext.util.JSON.encode(result.event)
             }));
-            
             this.showIMIP();
         }, this);
     },
@@ -248,8 +247,13 @@ Tine.Calendar.iMIPDetailsPanel = Ext.extend(Tine.Calendar.EventDetailsPanel, {
         singleRecordPanel.setVisible(true);
         singleRecordPanel.setHeight(150);
         
-        
-        this.record = existingEvent && ! preconditions ? existingEvent : event;
+        if (existingEvent) {
+            this.record = Tine.Calendar.backend.recordReader({
+                responseText: Ext.util.JSON.encode(existingEvent)
+            });
+        } else {
+            this.record = event;
+        }
         singleRecordPanel.loadRecord(this.record);
     }
 });