LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(js) Update children paths when renaming a mailbox

Browse source 
Fixes #4046
This commit is contained in:
Francis Lachapelle 2017-02-22 23:07:26 -05:00
parent 784503bdbc
commit 7a4dbcb364
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
UI/WebServerResources/js/Mailer/Mailbox.service.js
View file

@ -157,7 +157,7 @@
*/ */
Mailbox.prototype.init = function(data) { Mailbox.prototype.init = function(data) {
var _this = this; var _this = this;
if (angular.isUndefined(this.$messages)) { if (data.headers) {
this.$isLoading = true; this.$isLoading = true;
this.$messages = []; this.$messages = [];
this.uidsMap = {}; this.uidsMap = {};
@ -525,9 +525,8 @@
i = _.indexOf(_.map(children, 'id'), this.id); i = _.indexOf(_.map(children, 'id'), this.id);
return this.$save().then(function(data) { return this.$save().then(function(data) {
var sibling; var sibling, oldPath = _this.path;
angular.extend(_this, data); // update the path attribute _this.init(data); // update the path and id
_this.id = _this.$id();
// Move mailbox among its siblings according to its new name // Move mailbox among its siblings according to its new name
children.splice(i, 1); children.splice(i, 1);
@ -542,6 +541,17 @@
i = children.length; i = children.length;
} }
children.splice(i, 0, _this); children.splice(i, 0, _this);
// Update the path and id of children
var pathRE = new RegExp('^' + oldPath);
var _updateChildren = function(mailbox) {
_.forEach(mailbox.children, function(child) {
child.path = child.path.replace(pathRE, _this.path);
child.id = child.$id();
_updateChildren(child);
});
};
_updateChildren(_this);
}); });
}; };
@ -869,7 +879,7 @@
_this.init(data); _this.init(data);
if (_this.uids) { if (_this.uids) {
Mailbox.$log.debug('unwrapping ' + data.uids.length + ' messages'); Mailbox.$log.debug('unwrapping ' + _this.uids.length + ' messages');
// First entry of 'headers' are keys // First entry of 'headers' are keys
headers = _.invokeMap(_this.headers[0], 'toLowerCase'); headers = _.invokeMap(_this.headers[0], 'toLowerCase');