tildeverse/cryptpad
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix template issues with teams

Browse Source
This commit is contained in:
yflory 2021-11-02 13:36:15 +01:00
parent 448a2abb93
commit 8a4ead4711
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,7 +972,7 @@ define([
data.teamId = common.initialTeam; data.teamId = common.initialTeam;
} }
data.forceSave = 1; data.forceSave = 1;
delete common.initialTeam; //delete common.initialTeam;
} }
if (common.initialPath) { if (common.initialPath) {
if (!data.path) { if (!data.path) {

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

@ -1158,10 +1158,12 @@ define([
return void previewMediaTag(data); return void previewMediaTag(data);
} }
var obj = { t: APP.team };
var priv = metadataMgr.getPrivateData(); var priv = metadataMgr.getPrivateData();
var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']); var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
if (useUnsafe === true || APP.newSharedFolder) { if (useUnsafe === true || APP.newSharedFolder) {
return void window.open(APP.origin + href); return void common.openURL(Hash.getNewPadURL(href, obj));
} }
// Get hidden hash // Get hidden hash
@ -1170,7 +1172,7 @@ define([
if (isRo) { opts.view = true; } if (isRo) { opts.view = true; }
var hash = Hash.getHiddenHashFromKeys(parsed.type, secret, opts); var hash = Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
var hiddenHref = Hash.hashToHref(hash, parsed.type); var hiddenHref = Hash.hashToHref(hash, parsed.type);
window.open(APP.origin + hiddenHref); common.openURL(Hash.getNewPadURL(hiddenHref, obj));
}; };
var openIn = function (type, path, team, fData) { var openIn = function (type, path, team, fData) {
var obj = { var obj = {

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

@ -1295,6 +1295,7 @@ define([
}); });
sframeChan.on('Q_SAVE_AS_TEMPLATE', function (data, cb) { sframeChan.on('Q_SAVE_AS_TEMPLATE', function (data, cb) {
data.teamId = Cryptpad.initialTeam;
Cryptpad.saveAsTemplate(Cryptget.put, data, cb); Cryptpad.saveAsTemplate(Cryptget.put, data, cb);
}); });