web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix and reenable folder to SF conversion

Browse Source
This commit is contained in:
yflory
2020-02-10 12:01:00 +01:00
parent 403867d4cd
commit 09076f39ff
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1204,8 +1204,6 @@ define([
hide.push('collapseall');
}
containsFolder = true;
hide.push('share'); // XXX CONVERT
hide.push('savelocal'); // XXX CONVERT
hide.push('openro');
hide.push('openincode');
hide.push('properties');
@@ -4054,8 +4052,7 @@ define([
if (manager.isFolder(el) && !manager.isSharedFolder(el)) { // Folder
// if folder is inside SF
return UI.warn('ERROR: Temporarily disabled'); // XXX CONVERT
/*if (manager.isInSharedFolder(paths[0].path)) {
if (manager.isInSharedFolder(paths[0].path)) {
return void UI.alert(Messages.convertFolderToSF_SFParent);
}
// if folder already contains SF
@@ -4085,7 +4082,7 @@ define([
var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh);
});
}*/
}
} else { // File
var sf = manager.isSharedFolder(el);
data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);