pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-02-10 18:05:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v8.1.0' into develop

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Sergey Linnik
2024-03-21 14:23:41 +03:00
parent c712f596e1 1b8f60d5dd
commit 6d28e3f8d8
10 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
# Change Log
- fill permission in embedded mode
- delete all files
- handling conversion -9 error
- nodejs: wopi formsubmit icon

2
web/documentserver-example/csharp-mvc/Models/FileModel.cs
View File

@ -157,7 +157,7 @@ namespace OnlineEditorsExampleMVC.Models
{ "download", !user.deniedPermissions.Contains("download") },
{ "edit", canEdit && (editorsMode == "edit" || editorsMode == "view" || editorsMode == "filter" || editorsMode == "blockcontent") },
{ "print", !user.deniedPermissions.Contains("print") },
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "blockcontent" },
{ "modifyFilter", editorsMode != "filter" },
{ "modifyContentControl", editorsMode != "blockcontent" },
{ "review", canEdit && (editorsMode == "edit" || editorsMode == "review") },

2
web/documentserver-example/csharp/DocEditor.aspx.cs
View File

@ -225,7 +225,7 @@ namespace OnlineEditorsExample
{ "download", !user.deniedPermissions.Contains("download") },
{ "edit", canEdit && (editorsMode == "edit" || editorsMode =="view" || editorsMode == "filter" || editorsMode == "blockcontent") },
{ "print", !user.deniedPermissions.Contains("print") },
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "blockcontent" },
{ "modifyFilter", editorsMode != "filter" },
{ "modifyContentControl", editorsMode != "blockcontent" },
{ "review", canEdit && (editorsMode == "edit" || editorsMode == "review") },

1
web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
View File

@ -120,7 +120,6 @@ public class DefaultFileConfigurer implements FileConfigurer<DefaultFileWrapper>
userPermissions.setFillForms(
!action.equals(Action.view)
&& !action.equals(Action.comment)
&& !action.equals(Action.embedded)
&& !action.equals(Action.blockcontent)
);

2
web/documentserver-example/java/src/main/java/entities/FileModel.java
View File

@ -297,7 +297,7 @@ public class FileModel {
edit = canEdit && (modeParam.equals("edit") || modeParam.equals("view") || modeParam.equals("filter")
|| modeParam.equals("blockcontent"));
print = !user.getDeniedPermissions().contains("print");
fillForms = !modeParam.equals("view") && !modeParam.equals("comment") && !modeParam.equals("embedded")
fillForms = !modeParam.equals("view") && !modeParam.equals("comment")
&& !modeParam.equals("blockcontent");
modifyFilter = !modeParam.equals("filter");
modifyContentControl = !modeParam.equals("blockcontent");

2
web/documentserver-example/nodejs/app.js
View File

@ -1068,7 +1068,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
chat: userid !== 'uid-0',
coEditing: mode === 'view' && userid === 'uid-0' ? { mode: 'strict', change: false } : null,
comment: mode !== 'view' && mode !== 'fillForms' && mode !== 'embedded' && mode !== 'blockcontent',
fillForms: mode !== 'view' && mode !== 'comment' && mode !== 'embedded' && mode !== 'blockcontent',
fillForms: mode !== 'view' && mode !== 'comment' && mode !== 'blockcontent',
modifyFilter: mode !== 'filter',
modifyContentControl: mode !== 'blockcontent',
copy: !user.deniedPermissions.includes('copy'),

2
web/documentserver-example/nodejs/public/assets/document-formats

Submodule web/documentserver-example/nodejs/public/assets/document-formats updated: d81437e6d3...7b7c406cc6

2
web/documentserver-example/php/src/views/DocEditorView.php
View File

@ -132,7 +132,7 @@ final class DocEditorView extends View
$editorsMode == "view" || $editorsMode == "filter" || $editorsMode == "blockcontent"),
"print" => !in_array("print", $user->deniedPermissions),
"fillForms" => $editorsMode != "view" && $editorsMode != "comment"
&& $editorsMode != "embedded" && $editorsMode != "blockcontent",
&& $editorsMode != "blockcontent",
"modifyFilter" => $editorsMode != "filter",
"modifyContentControl" => $editorsMode != "blockcontent",
"review" => $canEdit && ($editorsMode == "edit" || $editorsMode == "review"),

2
web/documentserver-example/python/src/views/actions.py
View File

@ -279,7 +279,7 @@ def edit(request):
'edit': canEdit & ((edMode == 'edit') | (edMode == 'view') | (edMode == 'filter') \
| (edMode == "blockcontent")),
'print': 'print' not in user.deniedPermissions,
'fillForms': (edMode != 'view') & (edMode != 'comment') & (edMode != 'embedded') \
'fillForms': (edMode != 'view') & (edMode != 'comment') \
& (edMode != "blockcontent"),
'modifyFilter': edMode != 'filter',
'modifyContentControl': edMode != "blockcontent",

2
web/documentserver-example/ruby/app/models/file_model.rb
View File

@ -146,7 +146,7 @@ class FileModel
download: @user.denied_permissions.exclude?('download'),
edit: can_edit && ['edit', 'view', 'filter', 'blockcontent'].include?(editors_mode),
print: @user.denied_permissions.exclude?('print'),
fillForms: ['view', 'comment', 'embedded', 'blockcontent'].exclude?(editors_mode),
fillForms: ['view', 'comment', 'blockcontent'].exclude?(editors_mode),
modifyFilter: !editors_mode.eql?('filter'),
modifyContentControl: !editors_mode.eql?('blockcontent'),
review: can_edit && (editors_mode.eql?('edit') || editors_mode.eql?('review')),