Fix display of calendar notification email

This commit is contained in:
Francis Lachapelle
2018-09-06 08:24:48 -04:00
parent 6d9de5859e
commit 10485f8943
4 changed files with 10 additions and 6 deletions
+1
View File
@@ -10,6 +10,7 @@ Bug fixes
- [web] calendar properties were not completely reset on cancel
- [web] check ACLs on address book prior to delete cards
- [web] fixed condition of copy action on cards
- [web] fixed display of notification email in calendar properties
4.0.2 (2018-08-24)
------------------
+1 -1
View File
@@ -86,7 +86,7 @@
NS_DURING
{
o = [params objectForKey: @"name"];
if ([o isKindOfClass: [NSString class]])
if ([o isKindOfClass: [NSString class]] && ![o isEqualToString: [calendar displayName]])
[calendar renameTo: o];
o = [params objectForKey: @"color"];
@@ -81,7 +81,7 @@
<md-input-container flex-offset="5" md-no-float="md-no-float">
<input type="email"
label:placeholder="Email Address"
ng-model="properties.calendar.notifications.notifiedUserOnPersonalModifications"
ng-model="properties.calendar.notifiedUserOnPersonalModifications"
ng-required="properties.calendar.notifications.notifyUserOnPersonalModifications"
ng-disabled="!properties.calendar.notifications.notifyUserOnPersonalModifications"/>
</md-input-container>
@@ -253,10 +253,13 @@
function saveProperties(form) {
if (form.$valid) {
vm.calendar.$save();
// Refresh list instance
srcCalendar.init(vm.calendar.$omit());
$mdDialog.hide();
vm.calendar.$save().then(function() {
// Refresh list instance
srcCalendar.init(vm.calendar.$omit());
$mdDialog.hide();
}, function() {
form.$setPristine();
});
}
}