Fix handling of attendees when updating an event

Alinto · Jun 17, 2016 · 8cc0b94 · 8cc0b94
1 parent 20001b7
commit 8cc0b94
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/NEWS b/NEWS
@@ -27,6 +27,7 @@ Bug fixes
  - [web] honor the domain default SOGoAppointmentSendEMailNotifications (#3729)
  - [web] the login module parameter is now properly restored when set as "Last used"
  - [web] if cn isn't found for shared mailboxes, use email address (#3733)
+ - [web] fixed handling of attendees when updating an event
 
 3.1.2 (2016-06-06)
 ------------------

diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m
@@ -158,7 +158,7 @@ - (NSDictionary *) attributesInContext: (WOContext *) context
                 }
             }
         }
-      [attendeeData setObject: [[currentAttendee partStat] lowercaseString] forKey: @"status"];
+      [attendeeData setObject: [[currentAttendee partStat] lowercaseString] forKey: @"partstat"];
       [attendeeData setObject: [[currentAttendee role] lowercaseString] forKey: @"role"];
       if ([[currentAttendee delegatedTo] length])
 	[attendeeData setObject: [[currentAttendee delegatedTo] rfc822Email] forKey: @"delegatedTo"];
@@ -232,7 +232,9 @@ - (void) _setAttendees: (NSArray *) attendees
                   [currentAttendee setCn: [currentData objectForKey: @"name"]];
                   [currentAttendee setEmail: currentEmail];
                 }
-              [currentAttendee
+              if (!currentAttendee || ![[currentAttendee role] isEqualToString: role])
+                // Set the RSVP only if this is a new attendee or the role has changed
+                [currentAttendee
                     setRsvp: ([role isEqualToString: @"NON-PARTICIPANT"]
                               ? @"FALSE"
                               : @"TRUE")];

diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -548,7 +548,7 @@ - (id) renderedPart
       if (![[person delegatedTo] length])
         [a addObject: [NSDictionary dictionaryWithObjectsAndKeys: ([person cnWithoutQuotes] ? [person cnWithoutQuotes] : [person rfc822Email]), @"name",
                                     [person rfc822Email], @"email",
-                                    [[person partStatWithDefault] lowercaseString], @"status", nil]];
+                                    [[person partStatWithDefault] lowercaseString], @"partstat", nil]];
     }
 
   [d setObject: a  forKey: @"participants"];

diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
@@ -409,7 +409,7 @@ - (void) _adjustRecurrentRules
  * @apiParam {String} [attendees.name]        Attendee's name
  * @apiParam {String} attendees.email         Attendee's email address
  * @apiParam {String} [attendees.uid]         System user ID
- * @apiParam {String} attendees.status        Attendee's participation status
+ * @apiParam {String} attendees.partstat      Attendee's participation status
  * @apiParam {String} [attendees.role]        Either CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, or NON-PARTICIPANT
  * @apiParam {String} [attendees.delegatedTo] User that the original request was delegated to
  * @apiParam {String} [attendees.delegatedFrom] User the request was delegated from
@@ -617,7 +617,7 @@ - (void) _adjustRecurrentRules
  * @apiSuccess (Success 200) {String} [attendees.name]        Attendee's name
  * @apiSuccess (Success 200) {String} attendees.email         Attendee's email address
  * @apiSuccess (Success 200) {String} [attendees.uid]         System user ID
- * @apiSuccess (Success 200) {String} attendees.status        Attendee's participation status
+ * @apiSuccess (Success 200) {String} attendees.partstat      Attendee's participation status
  * @apiSuccess (Success 200) {String} [attendees.role]        Either CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, or NON-PARTICIPANT
  * @apiSuccess (Success 200) {String} [attendees.delegatedTo] User that the original request was delegated to
  * @apiSuccess (Success 200) {String} [attendees.delegatedFrom] User the request was delegated from

diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -261,7 +261,7 @@
                   <sg-avatar-image sg-email="$chip.email" size="32"><!-- avatar --></sg-avatar-image>
                 </div>
                 <div class="md-contact-name">{{$chip.name}}</div>
-                <md-icon ng-class="'icon-' + $chip.status"><!-- partstat --></md-icon>
+                <md-icon ng-class="'icon-' + $chip.partstat"><!-- partstat --></md-icon>
               </md-chip-template>
             </md-chips>
           </div>

diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
@@ -263,7 +263,7 @@
                   <sg-avatar-image sg-email="$chip.email" size="32"><!-- avatar --></sg-avatar-image>
                 </div>
                 <div class="md-contact-name">{{$chip.name || $chip.email}}</div>
-                <md-icon ng-class="'icon-' + $chip.status"><!-- partstat --></md-icon>
+                <md-icon ng-class="'icon-' + $chip.partstat"><!-- partstat --></md-icon>
                 <md-icon class="sg-chip-remove"
                          label:aria-label="Delete"
                          ng-click="editor.removeAttendee($chip)">close</md-icon>

diff --git a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
@@ -179,7 +179,7 @@
                     <a href="#"
                        ng-click="editor.newMessageWithRecipient($event, $chip.name, $chip.email)">{{$chip.name}}</a>
                   </div>
-                  <md-icon ng-class="'icon-' + $chip.status"><!-- partstat --></md-icon>
+                  <md-icon ng-class="'icon-' + $chip.partstat"><!-- partstat --></md-icon>
                 </md-chip-template>
               </md-chips>
             </div>

diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js
@@ -841,7 +841,7 @@
               name: ref.c_cn,
               email: ref.$preferredEmail(),
               role: 'req-participant',
-              status: 'needs-action',
+              partstat: 'needs-action',
               uid: ref.c_uid
             };
             if (!_.find(_this.attendees, function(o) {
@@ -864,7 +864,7 @@
           name: card.c_cn,
           email: card.$preferredEmail(),
           role: 'req-participant',
-          status: 'needs-action',
+          partstat: 'needs-action',
           uid: card.c_uid
         };
         if (!_.find(this.attendees, function(o) {