From 78c1244975a1525318a68ea7ec8b5d91f9d570c4 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 24 Sep 2018 11:22:09 -0400
Subject: [PATCH] Fix message editor in Address Book and Calendar

---
 .../js/Contacts/AddressBookController.js            |  1 +
 .../js/Scheduler/ComponentController.js             | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js
index 1374d3571..4d4f23298 100644
--- a/UI/WebServerResources/js/Contacts/AddressBookController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBookController.js
@@ -359,6 +359,7 @@
                 return onCompleteDeferred.resolve(element);
               },
               locals: {
+                stateParent: $scope,
                 stateAccount: account,
                 stateMessage: message,
                 onCompletePromise: function () {
diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index 9205481d8..2b0550542 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -6,8 +6,8 @@
   /**
    * @ngInject
    */
-  ComponentController.$inject = ['$rootScope', '$q', '$mdDialog', 'Calendar', 'Component', 'AddressBook', 'Alarm', 'Account', 'stateComponent'];
-  function ComponentController($rootScope, $q, $mdDialog, Calendar, Component, AddressBook, Alarm, Account, stateComponent) {
+  ComponentController.$inject = ['$rootScope', '$scope', '$q', '$mdDialog', 'Calendar', 'Component', 'AddressBook', 'Alarm', 'Account', 'stateComponent'];
+  function ComponentController($rootScope, $scope, $q, $mdDialog, Calendar, Component, AddressBook, Alarm, Account, stateComponent) {
     var vm = this, component;
 
     this.$onInit = function () {
@@ -70,6 +70,7 @@
                 return onCompleteDeferred.resolve(element);
               },
               locals: {
+                stateParent: $scope,
                 stateAccount: account,
                 stateMessage: message,
                 onCompletePromise: function () {
@@ -367,7 +368,7 @@
                 _.isObject(response.data.message))
               vm.attendeeConflictError = response.data.message;
             else
-              edit(form);
+              vm.edit(form);
           });
       }
     };
@@ -386,11 +387,11 @@
       $mdDialog.hide();
     };
 
-    function edit(form) {
-      vm.attendeeConflictError = false;
+    this.edit = function (form) {
+      this.attendeeConflictError = false;
       form.$setPristine();
       form.$setDirty();
-    }
+    };
 
     function getDays() {
       var days = [];