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

Merge branch 'master' of github.com:xwiki-labs/cryptpad

Browse Source
This commit is contained in:
ansuz 2019-08-29 12:13:23 +02:00
commit ebf41e93c0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,7 +464,10 @@ define([
// convert a folder to a Shared Folder // convert a folder to a Shared Folder
var _convertFolderToSharedFolder = function (Env, data, cb) { var _convertFolderToSharedFolder = function (Env, data, cb) {
var path = data.path; return void cb({
error: 'DISABLED'
}); // XXX CONVERT
/*var path = data.path;
var folderElement = Env.user.userObject.find(path); var folderElement = Env.user.userObject.find(path);
// don't try to convert top-level elements (trash, root, etc) to shared-folders // don't try to convert top-level elements (trash, root, etc) to shared-folders
// TODO also validate that you're in root (not templates, etc) // TODO also validate that you're in root (not templates, etc)
@ -554,7 +557,7 @@ define([
Env.user.userObject.delete([path], function () { Env.user.userObject.delete([path], function () {
cb(); cb();
}); });
}); });*/
}; };
// Delete permanently some pads or folders // Delete permanently some pads or folders

6
www/drive/inner.js
View File

@ -1162,6 +1162,7 @@ define([
hide.push('collapseall'); hide.push('collapseall');
} }
containsFolder = true; containsFolder = true;
hide.push('share'); // XXX CONVERT
hide.push('openro'); hide.push('openro');
hide.push('openincode'); hide.push('openincode');
hide.push('properties'); hide.push('properties');
@ -3934,7 +3935,8 @@ define([
}); });
} else if (manager.isFolder(el)) { // Folder } else if (manager.isFolder(el)) { // Folder
// if folder is inside SF // if folder is inside SF
if (manager.isInSharedFolder(paths[0].path)) { return UI.warn('ERROR: Temporarily disabled'); // XXX CONVERT
/*if (manager.isInSharedFolder(paths[0].path)) {
return void UI.alert(Messages.convertFolderToSF_SFParent); return void UI.alert(Messages.convertFolderToSF_SFParent);
} }
// if folder already contains SF // if folder already contains SF
@ -3964,7 +3966,7 @@ define([
var owned = Util.isChecked($(convertContent).find('#cp-upload-owned')); var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh); manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh);
}); });
} }*/
} else { // File } else { // File
data = manager.getFileData(el); data = manager.getFileData(el);
parsed = Hash.parsePadUrl(data.href); parsed = Hash.parsePadUrl(data.href);