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

Ability to set ownership and password when sharing a folder

pull/1/head
yflory 2019-08-27 10:53:41 +02:00
parent 0f23d7699a
commit 8957bbd782
4 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/common-interface.js
View File

@ -592,6 +592,16 @@ define([
]);
};
UI.createHelper = function (href, text) {
var q = h('a.fa.fa-question-circle', {
style: 'text-decoration: none !important;',
title: text,
href: href,
target: "_blank",
'data-tippy-placement': "right"
});
return q;
};
/*
* spinner

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

@ -492,8 +492,8 @@ define([
_addSharedFolder(Env, {
path: parentPath,
name: folderName,
owned: true, // XXX FIXME hardcoded preference
password: '', // XXX FIXME hardcoded preference
owned: data.owned, // XXX FIXME hardcoded preference
password: data.password || '', // XXX FIXME hardcoded preference
}, waitFor(function (id) {
// _addSharedFolder can be an id or an error
if (typeof(id) === 'object' && id && id.error) {
@ -1012,11 +1012,13 @@ define([
}
}, cb);
};
var convertFolderToSharedFolderInner = function (Env, path, cb) {
var convertFolderToSharedFolderInner = function (Env, path, owned, password, cb) {
return void Env.sframeChan.query("Q_DRIVE_USEROBJECT", {
cmd: "convertFolderToSharedFolder",
data: {
path: path
path: path,
owned: owned,
password: password
}
}, cb);
};

9
www/common/sframe-common-file.js
View File

@ -257,14 +257,7 @@ define([
store: true
};
var createHelper = function (href, text) {
var q = h('a.fa.fa-question-circle', {
style: 'text-decoration: none !important;',
title: text,
href: origin + href,
target: "_blank",
'data-tippy-placement': "right"
});
return q;
return UI.createHelper(origin + href, text);
};
var createManualStore = function (isFolderUpload) {
var privateData = common.getMetadataMgr().getPrivateData();

22
www/drive/inner.js
View File

@ -3940,12 +3940,28 @@ define([
else if (manager.hasSubSharedFolder(el)) {
return void UI.alert(Messages.convertFolderToSF_SFChildren);
}
// if root
else if (paths[0].path.length <= 1) {
return void UI.warn(Messages.error);
}
// if folder does not contains SF
else {
return void UI.confirm(Messages.convertFolderToSF_confirm, function(res) {
var convertContent = h('div', [
h('p', Messages.convertFolderToSF_confirm),
h('label', {for: 'cp-upload-password'}, Messages.creation_passwordValue),
UI.passwordInput({id: 'cp-upload-password'}),
h('span', {
style: 'display:flex;align-items:center;justify-content:space-between'
}, [
UI.createCheckbox('cp-upload-owned', Messages.sharedFolders_create_owned, true),
UI.createHelper(APP.origin + '/faq.html#keywords-owned', Messages.creation_owned1)
]),
]);
return void UI.confirm(convertContent, function(res) {
if (!res) { return; }
if (paths[0].path.length <= 1) { return; } // if root
manager.convertFolderToSharedFolder(paths[0].path, refresh);
var password = $(convertContent).find('#cp-upload-password').val() || undefined;
var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh);
});
}
} else { // File