pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/auto-conversion-error

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Sergey Linnik
2024-03-15 16:46:37 +03:00
parent 5258fd0674 a3016f3f96
commit 1da215b1eb
10 changed files with 142 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/documentserver-example/ruby/app/models/service_converter.rb
View File

@ -167,7 +167,13 @@ class ServiceConverter
percent_element = file_result['percent'] # get the percentage value
result_percent = Integer(percent_element, 10) unless percent_element.nil?
result_percent = unless percent_element.nil?
if percent_element.is_a?(String)
Integer(percent_element, 10)
else
Integer(percent_element)
end
end
result_percent = 99 if result_percent >= 100