Improve handling of notifications of a calendar

NEWS

@@ -19,6 +19,7 @@ Bug fixes
  - [web] fixed parsing of pasted email addresses from Spreadsheet (#4258)
  - [web] messages list not accessible when changing mailbox in expanded mail view (#4269)
  - [web] only one postal address of same type is saved (#4091)
+ - [web] improve handling of email notifications of a calendar properties
  - [eas] hebrew folders encoding problem using EAS (#4240)
 
 3.2.10 (2017-07-05)

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -1162,7 +1162,8 @@
                        inContext: context];
 	}
       
-      if ([[self container] notifyUserOnPersonalModifications])
+      if ([[self container] notifyUserOnPersonalModifications] &&
+          [[self container] notifiedUserOnPersonalModifications])
 	{
 	  id o;
 

UI/Templates/SchedulerUI/UIxCalendarProperties.wox

@@ -7,6 +7,7 @@
     xmlns:label="OGo:label"
     >
   <md-dialog flex="50" flex-sm="70" flex-xs="100">
+    <form name="calendarPropertiesForm" ng-submit="properties.saveProperties(calendarPropertiesForm)">
 
       <md-toolbar ng-class="properties.calendar.getClassName('bg')">
         <div class="md-toolbar-tools">
@@ -81,6 +82,7 @@
             <input type="email"
                    label:placeholder="Email Address"
                    ng-model="properties.calendar.notifications.notifiedUserOnPersonalModifications"
+                   ng-required="properties.calendar.notifications.notifyUserOnPersonalModifications"
                    ng-disabled="!properties.calendar.notifications.notifyUserOnPersonalModifications"/>
           </md-input-container>
         </div>
@@ -88,8 +90,12 @@
 
       <md-dialog-actions>
         <md-button type="button" ng-click="properties.close()"><var:string label:value="Cancel"/></md-button>
-      <md-button ng-click="properties.saveProperties()"><var:string label:value="Save"/></md-button>
+        <md-button type="submit"
+                   ng-disabled="calendarPropertiesForm.$invalid || calendarPropertiesForm.$submitted">
+          <var:string label:value="Save"/>
+        </md-button>
       </md-dialog-actions>
 
+    </form>
   </md-dialog>
 </container>

UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js

@@ -233,12 +233,14 @@
               srcCalendar.color = vm.calendar.color;
             });
 
-            function saveProperties() {
+            function saveProperties(form) {
+              if (form.$valid) {
                 vm.calendar.$save();
                 // Refresh list instance
                 srcCalendar.init(vm.calendar.$omit());
                 $mdDialog.hide();
               }
+            }
 
             function close() {
               $mdDialog.cancel();