Merge remote-tracking branch 'remotes/origin/develop' into feature/se…

…lect-cell # Conflicts: # CHANGELOG.md
ONLYOFFICE · Oct 12, 2023 · 73ef86e · 73ef86e
2 parents 5f19bdc + 64302b3
commit 73ef86e
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,7 @@
 # Change Log
 
-- csharp-mvc: onRequestSelectSpreadsheet method
-- csharp: onRequestSelectSpreadsheet method
-- java-spring: onRequestSelectSpreadsheet method
-- java: onRequestSelectSpreadsheet method
-- ruby: onRequestSelectSpreadsheet method
-- php: onRequestSelectSpreadsheet method
-- python: onRequestSelectSpreadsheet method
+- onRequestSelectSpreadsheet method
+- key in referenceData
 - nodejs: link in referenceData
 - nodejs: onRequestSelectDocument method
 - nodejs: onRequestSelectSpreadsheet method

diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@@ -840,6 +840,7 @@ private static void Reference(HttpContext context)
 
             var data = new Dictionary<string, object>() {
             { "fileType", (Path.GetExtension(fileName) ?? "").ToLower().Trim('.') },
+            { "key",  ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress() + "/" + fileName + "/" + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode())},
             { "url",  DocManagerHelper.GetDownloadUrl(fileName)},
             { "directUrl", directUrl ? DocManagerHelper.GetDownloadUrl(fileName, false) : null },
             { "referenceData", new Dictionary<string, string>()

diff --git a/web/documentserver-example/csharp/WebEditor.ashx.cs b/web/documentserver-example/csharp/WebEditor.ashx.cs
@@ -650,6 +650,9 @@ private static void Reference(HttpContext context)
 
             var data = new Dictionary<string, object>() {
             { "fileType", (Path.GetExtension(fileName) ?? "").ToLower().Trim('.') },
+            { "key", ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
+                        + "/" + Path.GetFileName(_Default.FileUri(fileName, true))
+                        + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode()) },
             { "url",  DocEditor.getDownloadUrl(fileName)},
             { "directUrl", directUrl ? DocEditor.getDownloadUrl(fileName, false) : null},
             { "referenceData", new Dictionary<string, string>()

diff --git a/...mple/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/...mple/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
@@ -513,6 +513,11 @@ public String reference(@RequestBody final Reference body) {
 
             HashMap<String, Object> data = new HashMap<>();
             data.put("fileType", fileUtility.getFileExtension(fileName));
+            data.put("key", serviceConverter.generateRevisionId(
+                storagePathBuilder.getStorageLocation()
+                + "/" + fileName + "/"
+                + new File(storagePathBuilder.getFileLocation(fileName)).lastModified()
+                ));
             data.put("url", documentManager.getDownloadUrl(fileName, true));
             data.put("directUrl", body.getDirectUrl() ? documentManager.getDownloadUrl(fileName, false) : null);
             data.put("referenceData", referenceData);

diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
@@ -725,6 +725,10 @@ private static void reference(final HttpServletRequest request,
 
             HashMap<String, Object> data = new HashMap<>();
             data.put("fileType", FileUtility.getFileExtension(fileName));
+            data.put("key", ServiceConverter.generateRevisionId(DocumentManager
+                .curUserHostAddress(null) + "/" + fileName + "/"
+                + Long.toString(new File(DocumentManager.storagePath(fileName, null))
+                .lastModified())));
             data.put("url", DocumentManager.getDownloadUrl(fileName, true));
             data.put("directUrl", directUrl ? DocumentManager.getDownloadUrl(fileName, false) : null);
             data.put("referenceData", referenceData);

diff --git a/web/documentserver-example/nodejs/helpers/docManager.js b/web/documentserver-example/nodejs/helpers/docManager.js
@@ -154,7 +154,7 @@ DocManager.prototype.saveFileData = function saveFileData(fileName, userid, user
   const minutes = (dateCreate.getMinutes() < 10 ? '0' : '') + dateCreate.getMinutes().toString();
   const month = (dateCreate.getMonth() < 10 ? '0' : '') + (parseInt(dateCreate.getMonth().toString(), 10) + 1);
   const sec = (dateCreate.getSeconds() < 10 ? '0' : '') + dateCreate.getSeconds().toString();
-  const dateFormat = `${dateCreate.getFullYear()}-${month}-${dateCreate.getDate()}`
+  const dateFormat = `${dateCreate.getFullYear()}-${month}-${dateCreate.getDate()} `
     + `${dateCreate.getHours()}:${minutes}:${sec}`;
 
   const fileInfo = this.historyPath(fileName, address, true); // get file history information

diff --git a/web/documentserver-example/php/src/ajax.php b/web/documentserver-example/php/src/ajax.php
@@ -566,6 +566,7 @@ function reference()
 
     $data = [
         "fileType" => trim(getInternalExtension($fileName), '.'),
+        "key" => getDocEditorKey($fileName),
         "url" => getDownloadUrl($fileName),
         "directUrl" => $post["directUrl"] ? getDownloadUrl($fileName, false) : null,
         "referenceData" => [

diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py
@@ -495,6 +495,7 @@ def reference(request):
 
     data = {
         'fileType' : fileUtils.getFileExt(fileName).replace('.', ''),
+        'key': docManager.generateFileKey(fileName,request),
         'url' : docManager.getDownloadUrl(fileName, request),
         'directUrl' : docManager.getDownloadUrl(fileName, request, False) if body["directUrl"] else None,
         'referenceData' : {

diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb
@@ -409,6 +409,7 @@ def reference
 
       data = {
         :fileType => File.extname(fileName).downcase.delete("."),
+        :key => ServiceConverter.generate_revision_id("#{DocumentHelper.cur_user_host_address(nil) + '/' + fileName}.#{File.mtime(DocumentHelper.storage_path(fileName, nil)).to_s}"),
         :url => DocumentHelper.get_download_url(fileName),
         :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName, false) : nil,
         :referenceData => {