From 407df843ec79fa81667ecd60daf3ec077df58a5f Mon Sep 17 00:00:00 2001 From: Wolfgang Ginolas Date: Mon, 3 Mar 2025 15:57:53 +0100 Subject: [PATCH] Migrate OO docs from 7.3 to 8.3 --- install-onlyoffice.sh | 5 +++-- www/common/onlyoffice/current-version.js | 2 +- www/common/onlyoffice/inner.js | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/install-onlyoffice.sh b/install-onlyoffice.sh index 003b11208..322737497 100755 --- a/install-onlyoffice.sh +++ b/install-onlyoffice.sh @@ -23,7 +23,7 @@ main() { ask_for_license - # Remeber the 1st version that is installed. This will help us install only + # Remember the 1st version that is installed. This will help us install only # needed OnlyOffice versions in a later version of this script. set_prop oldest_needed_version v1 @@ -33,7 +33,8 @@ main() { install_old_version v4 6ebc6938 install_old_version v5 88a356f0 install_old_version v6 abd8a309 - install_version v7 v8.3.0.82+10 1734b1e46cad5e3e8af0bdbae08989c66bb717c2df0c06a6cfc962162cdeafdc4c1d6afb77a435e8e665fce2a6703e4d354cb8d15e575d8939df5e4be67fd4fc + install_version v7 v7.3.3.60+9 315eaf6705bf350a5c4475d3efcd6d3964d28b2237e0b6bc475ac6e71ecc0dae4e565141d39b79fccc35308b559497fca5c4a39f69ac290c117a57290b942d8b + install_version v8 v8.3.0.82+10 1734b1e46cad5e3e8af0bdbae08989c66bb717c2df0c06a6cfc962162cdeafdc4c1d6afb77a435e8e665fce2a6703e4d354cb8d15e575d8939df5e4be67fd4fc install_x2t v7.3+1 ab0c05b0e4c81071acea83f0c6a8e75f5870c360ec4abc4af09105dd9b52264af9711ec0b7020e87095193ac9b6e20305e446f2321a541f743626a598e5318c1 rm -rf "$BUILDS_DIR" diff --git a/www/common/onlyoffice/current-version.js b/www/common/onlyoffice/current-version.js index 9b8a42212..de081ef4d 100644 --- a/www/common/onlyoffice/current-version.js +++ b/www/common/onlyoffice/current-version.js @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0-or-later define(() => { - const version = 7; + const version = 8; return { currentVersionNumber: version, currentVersion: 'v' + version diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index fdff6ad53..e79313dd3 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -3010,8 +3010,23 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null } readOnly = true; } + } else if (content && content.version <= 7) { + version = 'v7/'; + APP.migrate = true; + // Registedred ~~users~~ editors can start the migration + if (common.isLoggedIn() && !readOnly) { + content.migration = true; + APP.onLocal(); + } else { + msg = h('div.alert.alert-warning.cp-burn-after-reading', Messages.oo_sheetMigration_anonymousEditor); + if (APP.helpMenu) { + $(APP.helpMenu.menu).after(msg); + } else { + $('#cp-app-oo-editor').prepend(msg); + } + 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 if (content && content.saveLock && !isUserOnline(content.saveLock)) {