From cf1541bf3acf33f29b644a369ae57fb4c1193270 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Sat, 31 May 2025 23:08:54 +0300 Subject: [PATCH 1/2] nodejs: set users by parts --- CHANGELOG.md | 1 + .../nodejs/views/editor.ejs | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f090410..deb97559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: set users by parts - ur skin language - nodejs: preload frame moved from uploading popap - change preload.html address diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index 7c67691f..89c7e811 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -225,10 +225,27 @@ users = <%- JSON.stringify(usersForMentions) %>; } - docEditor.setUsers({ + if ((c === "protect" || c === "mention") && users && event.data.count) { + let from = event.data.from; + let count = event.data.count; + let search = event.data.search; + if (from != 0) users = []; + var resultCount = 234; + for (var i = Math.max(users.length, from); i < Math.min(from + count, resultCount); i++){ + users.push({ + email: "test@test.test" + (i + 1), + id: "id" + (i + 1), + name: "test_" + search + (i + 1) + }); + } + } + + var result = { "c": c, "users": users, - }); + }; + if (resultCount) result.total = resultCount; + docEditor.setUsers(result); }; var onRequestSendNotify = function(event) { // the user is mentioned in a comment From e15d9a31634a63c63732067578013543f7833b57 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 9 Jun 2025 16:04:30 +0300 Subject: [PATCH 2/2] 1.14.0 --- CHANGELOG.md | 1 + web/documentserver-example/csharp-mvc/web.appsettings.config | 2 +- web/documentserver-example/csharp/settings.config | 2 +- web/documentserver-example/go/config/configuration.json | 2 +- .../java-spring/src/main/resources/application.properties | 2 +- .../java/src/main/resources/settings.properties | 2 +- web/documentserver-example/nodejs/config/default.json | 2 +- web/documentserver-example/php-laravel/.env.example | 2 +- .../php/src/configuration/ConfigurationManager.php | 2 +- .../python/src/configuration/configuration.py | 2 +- .../ruby/app/configuration/configuration.rb | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index deb97559..ee1d28ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +## 1.14.0 - nodejs: set users by parts - ur skin language - nodejs: preload frame moved from uploading popap diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index ff40b84e..3a591650 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -1,7 +1,7 @@ - + diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 7892369f..eb44d638 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -1,7 +1,7 @@ - + diff --git a/web/documentserver-example/go/config/configuration.json b/web/documentserver-example/go/config/configuration.json index abd352a7..98ca404f 100644 --- a/web/documentserver-example/go/config/configuration.json +++ b/web/documentserver-example/go/config/configuration.json @@ -1,5 +1,5 @@ { - "VERSION": "1.13.0", + "VERSION": "1.14.0", "SERVER_ADDRESS" : "", "SERVER_PORT" : 3000, diff --git a/web/documentserver-example/java-spring/src/main/resources/application.properties b/web/documentserver-example/java-spring/src/main/resources/application.properties index 361c36bc..9ddaf4d2 100755 --- a/web/documentserver-example/java-spring/src/main/resources/application.properties +++ b/web/documentserver-example/java-spring/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.version=1.13.0 +server.version=1.14.0 server.address= server.port=4000 diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index 276e176f..f83c2b7b 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -1,4 +1,4 @@ -version=1.13.0 +version=1.14.0 filesize-max=5242880 storage-folder=app_data diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json index ffb62dd0..207365d9 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -1,5 +1,5 @@ { - "version": "1.13.0", + "version": "1.14.0", "log": { "appenders": [ { diff --git a/web/documentserver-example/php-laravel/.env.example b/web/documentserver-example/php-laravel/.env.example index e4761e1e..467d864b 100644 --- a/web/documentserver-example/php-laravel/.env.example +++ b/web/documentserver-example/php-laravel/.env.example @@ -16,7 +16,7 @@ DOCUMENT_STORAGE_DISPLAY_FORGOTTEN_PAGE=false ## DOCUMENT SERVER ENV VARIABLES -DOCUMENT_SERVER_VERSION=1.13.0 +DOCUMENT_SERVER_VERSION=1.14.0 DOCUMENT_SERVER_PUBLIC_URL=http://localhost:8080 DOCUMENT_SERVER_PRIVATE_URL=http://proxy:8080 diff --git a/web/documentserver-example/php/src/configuration/ConfigurationManager.php b/web/documentserver-example/php/src/configuration/ConfigurationManager.php index e2a5c3df..7019ae5a 100644 --- a/web/documentserver-example/php/src/configuration/ConfigurationManager.php +++ b/web/documentserver-example/php/src/configuration/ConfigurationManager.php @@ -22,7 +22,7 @@ use Example\Common\URL; class ConfigurationManager { - public string $version = '1.13.0'; + public string $version = '1.14.0'; public function getVersion(): string { diff --git a/web/documentserver-example/python/src/configuration/configuration.py b/web/documentserver-example/python/src/configuration/configuration.py index bd07cd7e..31fa1d75 100644 --- a/web/documentserver-example/python/src/configuration/configuration.py +++ b/web/documentserver-example/python/src/configuration/configuration.py @@ -22,7 +22,7 @@ from src.common import string class ConfigurationManager: - version = '1.13.0' + version = '1.14.0' def getVersion(self) -> str: return self.version diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 6b53847d..393da60e 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -31,7 +31,7 @@ class ConfigurationManager sig { void } def initialize - @version = '1.13.0' + @version = '1.14.0' end sig { returns(T.nilable(URI::Generic)) }