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

Fix an issue when trying to create a pad with a password from a template

Browse Source
This commit is contained in:
yflory 2018-05-17 18:15:10 +02:00
parent f218a9c119
commit ef735d6fe6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/cryptpad-common.js
View File

@ -438,7 +438,7 @@ define([
optsGet.password = password; optsGet.password = password;
}), href); }), href);
} }
if (parsed2.hashData && parsed2.hashData.password) { if (parsed2.hashData && parsed2.hashData.password && !optsPut.password) {
common.getPadAttribute('password', waitFor(function (err, password) { common.getPadAttribute('password', waitFor(function (err, password) {
optsPut.password = password; optsPut.password = password;
})); }));

3
www/common/sframe-common-outer.js
View File

@ -766,10 +766,11 @@ define([
// Pass rtConfig to useTemplate because Cryptput will create the file and // Pass rtConfig to useTemplate because Cryptput will create the file and
// we need to have the owners and expiration time in the first line on the // we need to have the owners and expiration time in the first line on the
// server // server
var cryptputCfg = $.extend(true, {}, rtConfig, {password: password});
Cryptpad.useTemplate(data.template, Cryptget, function () { Cryptpad.useTemplate(data.template, Cryptget, function () {
startRealtime(); startRealtime();
cb(); cb();
}, rtConfig); }, cryptputCfg);
return; return;
} }
// Start realtime outside the iframe and callback // Start realtime outside the iframe and callback