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/version-on-front

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Sergey Linnik
2023-12-05 13:21:41 +03:00
parent a0a1b036e3 7d8a1a8b6d
commit e65f6f27be
41 changed files with 1919 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/documentserver-example/ruby/app/views/home/editor.html.erb
View File

@ -103,20 +103,20 @@
var onRequestInsertImage = function(event) {
docEditor.insertImage({ // insert an image into the file
"c": event.data.c,
<%= raw @file.get_insert_image %>
<%= raw @file.insert_image %>
})
};
// the user is trying to select document for comparing by clicking the Document from Storage button
var onRequestSelectDocument = function(event) {
var data = <%= raw @file.dataDocument.to_json %>;
var data = <%= raw @file.data_document.to_json %>;
data.c = event.data.c;
docEditor.setRequestedDocument(data); // select a document for comparing
};
// the user is trying to select recipients data by clicking the Mail merge button
var onRequestSelectSpreadsheet = function (event) {
var data = <%= raw @file.dataSpreadsheet.to_json %>;
var data = <%= raw @file.data_spreadsheet.to_json %>;
data.c = event.data.c;
docEditor.setRequestedSpreadsheet(data); // insert recipient data for mail merge into the file
};
@ -238,7 +238,7 @@
var сonnectEditor = function () {
config = <%= raw @file.get_config.to_json %>;
config = <%= raw @file.config.to_json %>;
config.width = "100%";
config.height = "100%";
@ -259,7 +259,7 @@
};
<%
usersMentions = @file.get_users_mentions %>
usersMentions = @file.users_mentions %>
if (config.editorConfig.user.id) {
// add mentions for not anonymous users
@ -270,7 +270,7 @@
switch (c) {
case "info":
users = [];
var allUsers = <%= raw @file.get_users_info.to_json %>;
var allUsers = <%= raw @file.users_info.to_json %>;
for (var i = 0; i < event.data.id.length; i++) {
for (var j = 0; j < allUsers.length; j++) {
if (allUsers[j].id == event.data.id[i]) {
@ -281,10 +281,10 @@
}
break;
case "protect":
var users = <%= raw @file.get_users_protect.to_json %>;
var users = <%= raw @file.users_protect.to_json %>;
break;
default:
users = <%= raw @file.get_users_mentions.to_json %>;
users = <%= raw @file.users_mentions.to_json %>;
}
docEditor.setUsers({
"c": c,

4
web/documentserver-example/ruby/app/views/home/index.html.erb
View File

@ -62,7 +62,7 @@
<span class="select-user">Username</span>
<img id="info" class="info" data-id="user" src="assets/info.svg" />
<select class="select-user" id="user">
<% for user in Users.get_all_users() do %>
<% for user in Users.all_users() do %>
<option value="<%= user.id %>"><%= user.name ? user.name : "Anonymous" %></option>
<% end %>
</select>
@ -110,7 +110,7 @@
</span>
<span class="portal-descr">Please do NOT use this integration example on your own server without proper code modifications, it is intended for testing purposes only. In case you enabled this test example, disable it before going for production.</span>
<span class="portal-descr">You can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions.</span>
<% for user in Users.get_all_users() do %>
<% for user in Users.all_users() do %>
<div class="user-descr">
<b><%= user.name ? user.name : "Anonymous" %></b>
<ul>