Merge pull request #34 from modoboa/fix/attendees

Fixed attendees selection.
modoboa · Jul 16, 2018 · ab9d6be · ab9d6be
2 parents d9060f7 + 0d5a82a
commit ab9d6be
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -16,11 +16,11 @@
     "fullcalendar": "^3.9.0",
     "js-cookie": "^2.2.0",
     "luxon": "^0.5.8",
-    "vue": "^2.5.2",
+    "vue": "^2.5.16",
     "vue-color": "^2.4.5",
     "vue-flatpickr-component": "^7.0.0",
     "vue-gettext": "^2.0.26",
-    "vue-multiselect": "^2.0.8",
+    "vue-multiselect": "^2.1.0",
     "vue-notification": "^1.3.7",
     "vue-resource": "^1.5.0",
     "vue-router": "^3.0.1",
@@ -75,7 +75,7 @@
     "vue-jest": "^1.0.2",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.2",
+    "vue-template-compiler": "^2.5.16",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-bundle-tracker": "^0.3.0",

diff --git a/frontend/src/components/EventForm.vue b/frontend/src/components/EventForm.vue
@@ -43,7 +43,10 @@
         </div>
         <div class="col-sm-5">
           <h4><translate>Attendees</translate></h4>
-          <multiselect multiple label="display_name" :options="attendees" :taggable="true" v-model="event.attendees"></multiselect>
+          <multiselect multiple label="display_name" :options="attendees"
+                       v-model="event.attendees" :close-on-select="false"
+                       :hide-selected="true" track-by="email">
+          </multiselect>
         </div>
       </div>
 

diff --git a/modoboa_radicale/backends/caldav_.py b/modoboa_radicale/backends/caldav_.py
@@ -115,13 +115,15 @@ def update_event(self, uid, original_data):
             orig_evt.add("dtend", data["end"])
         if "description" in data:
             orig_evt["description"] = data["description"]
-        for attdef in data.get("attendees", []):
-            attendee = icalendar.vCalAddress(
-                "MAILTO:{}".format(attdef["email"]))
-            attendee.params["cn"] = icalendar.vText(attdef["display_name"])
-            attendee.params["ROLE"] = icalendar.vText('REQ-PARTICIPANT')
-            del orig_evt["attendee"]
-            orig_evt.add("attendee", attendee, encode=0)
+        if "attendees" in data:
+            if "attendee" in orig_evt:
+                del orig_evt["attendee"]
+            for attdef in data.get("attendees", []):
+                attendee = icalendar.vCalAddress(
+                    "MAILTO:{}".format(attdef["email"]))
+                attendee.params["cn"] = icalendar.vText(attdef["display_name"])
+                attendee.params["ROLE"] = icalendar.vText('REQ-PARTICIPANT')
+                orig_evt.add("attendee", attendee, encode=0)
         cal.instance.subcomponents = []
         cal.instance.add_component(orig_evt)
         if "calendar" in data and self.calendar.pk != data["calendar"].pk: