mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-07-10 02:45:08 +00:00
(js) Improve event editor
- fixed form validity check; - fixed alarm restoration after a reset; - fixed recurrence rules check.
This commit is contained in:
@@ -122,8 +122,8 @@
|
||||
|
||||
c.$reply().then(function() {
|
||||
$rootScope.$emit('calendars:list');
|
||||
$mdDialog.hide();
|
||||
Alarm.getAlarms();
|
||||
$mdDialog.hide();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -217,6 +217,7 @@
|
||||
vm.categories = {};
|
||||
vm.showRecurrenceEditor = vm.component.$hasCustomRepeat;
|
||||
vm.toggleRecurrenceEditor = toggleRecurrenceEditor;
|
||||
vm.recurrenceMonthDaysAreRequired = recurrenceMonthDaysAreRequired;
|
||||
vm.showAttendeesEditor = false;
|
||||
vm.toggleAttendeesEditor = toggleAttendeesEditor;
|
||||
//vm.searchText = null;
|
||||
@@ -263,6 +264,11 @@
|
||||
vm.showAttendeesEditor = !vm.showAttendeesEditor;
|
||||
}
|
||||
|
||||
function recurrenceMonthDaysAreRequired() {
|
||||
return vm.component.repeat.frequency == 'monthly' &&
|
||||
vm.component.repeat.month.type == 'bymonthday';
|
||||
}
|
||||
|
||||
// Autocomplete cards for attendees
|
||||
function cardFilter($query) {
|
||||
AddressBook.$filterAll($query);
|
||||
@@ -308,8 +314,11 @@
|
||||
Alarm.getAlarms();
|
||||
$mdDialog.hide();
|
||||
}, function(response) {
|
||||
if (response.status == CalendarSettings.ConflictHTTPErrorCode)
|
||||
if (response.status == CalendarSettings.ConflictHTTPErrorCode &&
|
||||
_.isObject(response.data.message))
|
||||
vm.attendeeConflictError = response.data.message;
|
||||
else
|
||||
edit(form);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user