Fix folder's name when subscribing to a folder

pull/64/head
Francis Lachapelle 2014-10-09 15:12:24 -04:00
parent 460ed2e7bc
commit f8a371e351
2 changed files with 3 additions and 2 deletions

1
NEWS
View File

@ -4,6 +4,7 @@
Bug fixes
- fixed freebusy lookup with "Show time as busy" (#2930)
- don't escape <br>'s in a card's note field
- fixed folder's display name when subscribing to a folder
- fixed folder's display name when the active user subscribes another user to one of her/his folders
2.2.9a (2014-09-29)

View File

@ -199,7 +199,7 @@ function addFolderBranchToTree(tree, user, folder, nodeId, subId, isLast) {
node._ls = isLast;
var content = tree.node(node, (nodeId + subId), null);
content._formattedName = folder.formattedName;
content.displayName = folder.displayName;
return content;
}
@ -228,7 +228,7 @@ function onConfirmFolderSelection(event) {
folderName = description.replace(/>,.*$/, ">", "g");
}
else {
folderName = node._formattedName;
folderName = node.displayName;
}
var data = { folderName: folderName, folder: folder, type: type, window: window };
if (parent$(accessToSubscribedFolder(folder)))