From fec299f040da27faedc4521ea51c95c718f70ddf Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 16 Apr 2021 13:53:02 -0400
Subject: [PATCH] fix(calendar(js)): show conflict error inside appointment
 editor

A single string error is returned when at least one of the attendees
refuses to be invited.
---
 UI/WebServerResources/js/Scheduler/ComponentController.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index ad129d721..f3b7e35ca 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -480,9 +480,8 @@
               Preferences.getAlarms();
               $mdDialog.hide();
             }, function(response) {
-              if (response.status == CalendarSettings.ConflictHTTPErrorCode &&
-                  _.isObject(response.data.message))
-                vm.attendeeConflictError = response.data.message;
+              if (response.status == CalendarSettings.ConflictHTTPErrorCode)
+                vm.attendeeConflictError = _.isObject(response.data.message) ? response.data.message : { reject: response.data.message };
               else
                 vm.edit(form);
             });