blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix migration detection

Browse source
This commit is contained in:
yflory 2021-11-04 14:20:22 +01:00
parent 045cb86f3e
commit c450311ad3
1 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
www/common/onlyoffice/inner.js
View file

@ -1643,6 +1643,40 @@ define([
}
},
"onDocumentReady": function () {
if (content.version === 4 && NEW_VERSION === 5) {
var skip = false;
// Skip if there is no chart in the document
if (getEditor()) {
var app = common.getMetadataMgr().getPrivateData().ooType;
var d;
if (app === 'doc') {
console.error('ici');
d = getEditor().GetDocument();
} else if (app === 'presentation') {
//d = getEditor().GetPresentation();
// XXX can't skip until we find a chart detector
}
if (d) {
skip = !d.GetAllCharts().length;
}
}
if (skip) {
delete content.migration;
content.version = NEW_VERSION;
APP.onLocal();
APP.realtime.onSettle(function () {
UI.removeModals();
UI.alert(Messages.oo_sheetMigration_complete, function () {
common.gotoURL();
});
return;
});
return;
}
}
evOnSync.fire();
var onMigrateRdy = Util.mkEvent();
onMigrateRdy.reg(function () {
@ -2858,14 +2892,6 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
}
} else if (content && content.version <= 4) { // V2 or V3
version = content.version <= 3 ? 'v2b/' : 'v4/';
var skip = false;
if (content.version === 4 && NEW_VERSION === 5) {
// Skip if there is no chart in the document
skip = !getEditor().GetDocument().GetAllCharts().length;
}
if (skip) {
content.version = NEW_VERSION;
} else {
APP.migrate = true;
// Registedred ~~users~~ editors can start the migration
if (common.isLoggedIn() && !readOnly) {
@ -2881,7 +2907,6 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
readOnly = true;
}
}
}
// NOTE: don't forget to also update the version in 'EV_OOIFRAME_REFRESH'
// If the sheet is locked by an offline user, remove it