From 6fd99270927a6ca5e12d2e04c0a68ec05bfc8b4e Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 12 Apr 2017 14:56:38 -0400
Subject: [PATCH] (js) Fix email reminder with attendees

Fixes #4115
---
 NEWS                                          |  1 +
 .../SchedulerUI/UIxReminderEditor.wox         | 31 ++++++++++---------
 .../js/Scheduler/Component.service.js         | 10 ------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/NEWS b/NEWS
index 32c374b8e..8703ddb49 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Enhancements
 
 Bug fixes
  - [web] fixed attachment path when inside multiple body parts
+ - [web] fixed email reminder with attendees (#4115)
  - [core] cherry-picked comma escaping fix from v2 (#3296)
  - [core] fix sogo-tool restore potentially crashing on corrupted data (#4048)
  - [eas] set reply/forwarded flags when ReplaceMime is set (#4133)
diff --git a/UI/Templates/SchedulerUI/UIxReminderEditor.wox b/UI/Templates/SchedulerUI/UIxReminderEditor.wox
index 9bd65851c..fa07aa128 100644
--- a/UI/Templates/SchedulerUI/UIxReminderEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxReminderEditor.wox
@@ -40,22 +40,23 @@
       <md-radio-button value="email">
         <var:string label:value="Send an E-mail"/>
       </md-radio-button>
+      <div layout="row" flex-offset="5"
+           ng-show="editor.component.canRemindAttendeesByEmail()">
+        <md-checkbox ng-model="editor.component.alarm.organizer"
+                     ng-true-value="1"
+                     ng-false-value="0"
+                     label:aria-label="Email Organizer">
+          <var:string label:value="Email Organizer"/>
+        </md-checkbox>
+        <var:entity const:name="nbsp" />
+        <md-checkbox ng-model="editor.component.alarm.attendees"
+                     ng-true-value="1"
+                     ng-false-value="0"
+                     label:aria-label="Email Attendees">
+          <var:string label:value="Email Attendees"/>
+        </md-checkbox>
+      </div>
     </md-radio-group>
-    <div layout="row" flex-offset="5"
-         ng-show="editor.component.canRemindAttendeesByEmail()">
-      <md-checkbox ng-model="editor.component.alarm.organizer"
-                   ng-true-value="1"
-                   ng-false-value="0"
-                   label:aria-label="Email Organizer">
-        <var:string label:value="Email Organizer"/>
-      </md-checkbox>
-      <md-checkbox ng-model="editor.component.alarm.attendees"
-                   ng-true-value="1"
-                   ng-false-value="0"
-                   label:aria-label="Email Attendees">
-        <var:string label:value="Email Attendees"/>
-      </md-checkbox>
-    </div>
   </var:if>
 
 </container>
diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js
index 8fcf20408..5939c81fe 100644
--- a/UI/WebServerResources/js/Scheduler/Component.service.js
+++ b/UI/WebServerResources/js/Scheduler/Component.service.js
@@ -689,16 +689,6 @@
     return (this.occurrenceId && this.userHasRSVP);
   };
 
-  /**
-   * @function isReadOnly
-   * @memberof Component.prototype
-   * @desc Check if the component is not editable and not an invitation
-   * @returns true or false
-   */
-  Component.prototype.isReadOnly = function() {
-    return (this.isReadOnly && !this.userHasRSVP);
-  };
-
   /**
    * @function enablePercentComplete
    * @memberof Component.prototype