Merge pull request #2868 from ONLYOFFICE/fix/bugfix

Handle EditingError
ONLYOFFICE · Feb 29, 2024 · 9ee2f80 · 9ee2f80
2 parents b24eb0e + d00bc1b
commit 9ee2f80
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -678,6 +678,10 @@ PE.ApplicationController = new(function(){
             case Asc.c_oAscError.ID.SessionToken: // don't show error message
                 return;
 
+            case Asc.c_oAscError.ID.EditingError:
+                message = me.errorEditingDownloadas;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -865,6 +869,7 @@ PE.ApplicationController = new(function(){
         titleLicenseExp: 'License expired',
         titleLicenseNotActive: 'License not active',
         warnLicenseBefore: 'License not active. Please contact your administrator.',
-        warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.'
+        warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.',
+        errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',
     }
 })();
diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json
@@ -42,6 +42,7 @@
   "PE.ApplicationController.waitText": "Please, wait...",
   "PE.ApplicationController.warnLicenseBefore": "License not active. Please contact your administrator.",
   "PE.ApplicationController.warnLicenseExp": "Your license has expired. Please update your license and refresh the page.",
+  "PE.ApplicationController.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as' option to save the file backup copy to a drive.",
   "PE.ApplicationView.txtDownload": "Download",
   "PE.ApplicationView.txtEmbed": "Embed",
   "PE.ApplicationView.txtFileLocation": "Open file location",

diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -596,6 +596,10 @@ SSE.ApplicationController = new(function(){
             case Asc.c_oAscError.ID.SessionToken: // don't show error message
                 return;
 
+            case Asc.c_oAscError.ID.EditingError:
+                message = me.errorEditingDownloadas;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -821,6 +825,7 @@ SSE.ApplicationController = new(function(){
         titleLicenseExp: 'License expired',
         titleLicenseNotActive: 'License not active',
         warnLicenseBefore: 'License not active. Please contact your administrator.',
-        warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.'
+        warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.',
+        errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',
     }
 })();
diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json
@@ -42,6 +42,7 @@
   "SSE.ApplicationController.waitText": "Please, wait...",
   "SSE.ApplicationController.warnLicenseBefore": "License not active. Please contact your administrator.",
   "SSE.ApplicationController.warnLicenseExp": "Your license has expired. Please update your license and refresh the page.",
+  "SSE.ApplicationController.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as' option to save the file backup copy to a drive.",
   "SSE.ApplicationView.txtDownload": "Download",
   "SSE.ApplicationView.txtEmbed": "Embed",
   "SSE.ApplicationView.txtFileLocation": "Open file location",