amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-24 14:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix saving of inactive calendars

Browse Source 
Fixes #3862, #3980
This commit is contained in:
Francis Lachapelle
2017-01-06 06:41:38 -05:00
parent 02fc147624
commit ea7934a73c
5 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
UI/WebServerResources/js/Scheduler/CalendarsController.js
View File

@@ -58,7 +58,7 @@
);
},
function(newList, oldList) {
var commonList, ids, promises;
var commonList, ids, promise;
// Identify which calendar has changed
commonList = _.intersectionBy(newList, oldList, 'id');
@@ -66,17 +66,14 @@
var oldObject = _.find(oldList, { id: o.id });
return !_.isEqual(o, oldObject);
}), 'id');
promises = [];
promise = Calendar.$q.when();
if (ids.length > 0) {
$log.debug(ids.join(', ') + ' changed');
_.forEach(ids, function(id) {
var calendar = Calendar.$get(id);
promises.push(calendar.$setActivation());
});
promise = Calendar.saveFoldersActivation(ids);
}
if (promises.length > 0 || commonList.length != newList.length || commonList.length != oldList.length)
Calendar.$q.all(promises).then(function() {
if (ids.length > 0 || commonList.length != newList.length || commonList.length != oldList.length)
promise.then(function() {
$rootScope.$emit('calendars:list');
});
},