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

Fix 'store in cryptdrive' displayed when creating a pad from the drive

pull/1/head
yflory 2022-02-28 14:31:10 +01:00
parent ac7409f7ef
commit afa799867a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/outer/async-store.js
View File

@ -1170,7 +1170,7 @@ define([
// If it is stored, update its data, otherwise ask the user if they want to store it
var allData = [];
var sendTo = [];
var inTargetDrive;
var inTargetDrive, inMyDrive;
getAllStores().forEach(function (s) {
// If this is an edit link but we don't have edit rights, this entry is not useful
if (h.mode === "edit" && s.id && !s.secondaryKey) {
@ -1189,6 +1189,8 @@ define([
}
}
if (!s.id) { inMyDrive = res.length; }
Array.prototype.push.apply(allData, res);
});
var contains = allData.length !== 0;
@ -1253,7 +1255,7 @@ define([
// Let inner know that dropped files shouldn't trigger the popup
postMessage(clientId, "AUTOSTORE_DISPLAY_POPUP", {
stored: true,
inMyDrive: !contains && data.teamId // display "store in cryptdrive" entry
inMyDrive: inMyDrive || (!contains && !data.teamId) // display "store in cryptdrive" entry
});
return;
}
@ -1268,7 +1270,7 @@ define([
// Let inner know that dropped files shouldn't trigger the popup
postMessage(clientId, "AUTOSTORE_DISPLAY_POPUP", {
stored: true,
inMyDrive: true
inMyDrive: inMyDrive
});
nThen(function (waitFor) {
sendTo.forEach(function (teamId) {