infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix inconsistency between SF title in the tree and in the content

pull/1/head
yflory 2021-01-07 16:59:29 +01:00
parent b7a492a11b
commit d3db915927
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/drive-ui.js
View File

@ -3945,7 +3945,8 @@ define([
var newRoot = Util.find(manager, ['folders', sfId, 'proxy', manager.user.userObject.ROOT]) || {};
subfolder = manager.hasSubfolder(newRoot);
// Fix name
key = manager.getSharedFolderData(sfId).title || Messages.fm_deletedFolder;
var sfData = manager.getSharedFolderData(sfId);
key = sfData.title || sfData.lastTitle || Messages.fm_deletedFolder;
// Fix icon
$icon = isCurrentFolder ? $sharedFolderOpenedIcon : $sharedFolderIcon;
isSharedFolder = sfId;

4
www/common/proxy-manager.js
View File

@ -973,8 +973,8 @@ define([
if (!resolved.id) {
var el = Env.user.userObject.find(resolved.path);
if (Env.user.userObject.isSharedFolder(el) && Env.folders[el]) {
Env.folders[el].proxy.metadata.title = data.newName;
Env.user.proxy[UserObject.SHARED_FOLDERS][el].lastTitle = data.newName;
Env.folders[el].proxy.metadata.title = data.newName || Messages.fm_folder;
Env.user.proxy[UserObject.SHARED_FOLDERS][el].lastTitle = data.newName || Messages.fm_folder;
return void cb();
}
}