From 8a4ead4711ca6a99e6a0e85155ce570a9582f3a6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 2 Nov 2021 13:36:15 +0100
Subject: [PATCH] Fix template issues with teams

---
 www/common/cryptpad-common.js     | 2 +-
 www/common/drive-ui.js            | 6 ++++--
 www/common/sframe-common-outer.js | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 4c6df2c0d..a0d584ea5 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -972,7 +972,7 @@ define([
                 data.teamId = common.initialTeam;
             }
             data.forceSave = 1;
-            delete common.initialTeam;
+            //delete common.initialTeam;
         }
         if (common.initialPath) {
             if (!data.path) {
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 397ed06f7..49b7ec628 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1158,10 +1158,12 @@ define([
                 return void previewMediaTag(data);
             }
 
+            var obj = { t: APP.team };
+
             var priv = metadataMgr.getPrivateData();
             var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
             if (useUnsafe === true || APP.newSharedFolder) {
-                return void window.open(APP.origin + href);
+                return void common.openURL(Hash.getNewPadURL(href, obj));
             }
 
             // Get hidden hash
@@ -1170,7 +1172,7 @@ define([
             if (isRo) { opts.view = true; }
             var hash = Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
             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 obj = {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index ef8f7c1e6..09e8f79b1 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1295,6 +1295,7 @@ define([
             });
 
             sframeChan.on('Q_SAVE_AS_TEMPLATE', function (data, cb) {
+                data.teamId = Cryptpad.initialTeam;
                 Cryptpad.saveAsTemplate(Cryptget.put, data, cb);
             });