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

Shared folder password change

Browse Source
This commit is contained in:
yflory
2019-10-21 15:22:59 +02:00
parent 66f2ece08e
commit 302030e1ee
13 changed files with 446 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/common-ui-elements.js
View File

@@ -548,6 +548,7 @@ define([
var sframeChan = common.getSframeChannel();
var changePwTitle = Messages.properties_changePassword;
var changePwConfirm = Messages.properties_confirmChange;
var isSharedFolder = parsed.type === 'drive';
if (!hasPassword) {
changePwTitle = Messages.properties_addPassword;
changePwConfirm = Messages.properties_confirmNew;
@@ -577,6 +578,7 @@ define([
password: newPass
}, function (err, data) {
if (err || data.error) {
console.error(err || data.error);
return void UI.alert(Messages.properties_passwordError);
}
UI.findOKButton().click();
@@ -589,7 +591,9 @@ define([
}, {force: true});
}
return void UI.alert(Messages.properties_passwordSuccess, function () {
common.gotoURL(hasPassword && newPass ? undefined : (data.href || data.roHref));
if (!isSharedFolder) {
common.gotoURL(hasPassword && newPass ? undefined : (data.href || data.roHref));
}
}, {force: true});
});
});