From 1a73be6a124c553c005db31151d6afdbf9cbb36e Mon Sep 17 00:00:00 2001
From: sshakndr <aleksandr.kondratyev@onlyoffice.com>
Date: Tue, 18 Mar 2025 12:52:54 +0700
Subject: [PATCH] fix(ruby): correct file name for conversion instead of
 changing download link

---
 .../ruby/app/assets/javascripts/jscript.js          |  3 +--
 .../ruby/app/controllers/home_controller.rb         |  3 ++-
 .../ruby/app/models/service_converter.rb            | 13 +++++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
index f08038cf..925837b6 100644
--- a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
+++ b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
@@ -425,8 +425,7 @@ if (typeof jQuery != "undefined") {
                             jq("#beginViewConverted").removeClass("disable");
                             jq("#downloadConverted").attr("data","fromStorage");
                         } else {
-                            let newFilename = fileName.split('.').slice(0,-1).join('.')
-                            jq("#hiddenFileName").attr("data",response.filename.split("&filename=download").join(`&filename=${newFilename}`));
+                            jq("#hiddenFileName").attr("data",response.filename);
                             jq("#downloadConverted").attr("data","fromConverter");
                         }
                         jq("td[name='convertingTypeButton']").removeClass("disable orange");
diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb
index 0b0fc2c6..9104c9e0 100755
--- a/web/documentserver-example/ruby/app/controllers/home_controller.rb
+++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb
@@ -153,7 +153,8 @@ class HomeController < ApplicationController
         key,
         true,
         file_pass,
-        lang
+        lang,
+        file_name
       ) # get the url and file type of the converted file and the conversion percentage
 
       # if the conversion isn't completed, write file name and step values to the response
diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb
index 1b4cabec..3af6719f 100755
--- a/web/documentserver-example/ruby/app/models/service_converter.rb
+++ b/web/documentserver-example/ruby/app/models/service_converter.rb
@@ -30,11 +30,20 @@ class ServiceConverter
   @document_converter_url = ServiceConverter.config_manager.document_server_converter_uri.to_s
 
   # get the url of the converted file
-  def self.get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil)
+  def self.get_converted_data(
+    document_uri,
+    from_ext,
+    to_ext,
+    document_revision_id,
+    is_async,
+    file_pass,
+    lang = nil,
+    title = nil
+  )
     from_ext = File.extname(document_uri).downcase if from_ext.nil? # get the current document extension
 
     # get the current document name or uuid
-    title = File.basename(URI.parse(document_uri).path)
+    title = File.basename(URI.parse(document_uri).path) if title.nil?
     title = UUID.generate.to_s if title.nil?
 
     # get the document key