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

Migration for read-only links + fix issues with read-only pads

Browse Source
This commit is contained in:
yflory
2018-06-29 18:16:04 +02:00
parent 0f9a71686e
commit 425ac8ea57
9 changed files with 84 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/mergeDrive.js
View File

@@ -119,6 +119,7 @@ define([
});
oldFiles.forEach(function (id) {
var href = oldRecentPads[id].href || oldRecentPads[id].roHref;
var isRo = href === oldRecentPads[id].roHref;
// Do not migrate a pad if we already have it, it would create a duplicate in the drive
if (newHrefs.indexOf(href) !== -1) { return; }
// If we have a stronger version, do not add the current href