From e4f5f0bca7b0da38ca77d18f2a713652c02b5875 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 15 Oct 2024 18:06:37 +0300 Subject: [PATCH] submit not for viewer This reverts commit 35cf2fb0b02cc639a07bb7440595266573ee3ce5. --- CHANGELOG.md | 1 - web/documentserver-example/csharp-mvc/Models/FileModel.cs | 2 +- web/documentserver-example/csharp/DocEditor.aspx.cs | 2 +- .../integration/sdk/service/ConfigServiceImpl.java | 3 ++- .../java/src/main/java/entities/FileModel.java | 4 +++- web/documentserver-example/nodejs/app.js | 5 ++++- web/documentserver-example/php/src/views/DocEditorView.php | 2 +- web/documentserver-example/python/src/views/actions.py | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dea68d0f..479e2980 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ - he-IL skin language - ConvertService.ashx address replaced with converter - coauthoring/CommandService.ashx address replaced with command -- submitForm for all modes ## 1.10.0 - nodejs: converting function on index page diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index 03b6ac92..26f05c29 100755 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -89,7 +89,7 @@ namespace OnlineEditorsExampleMVC.Models editorsMode = "fillForms"; canEdit = true; } - var submitForm = user.id.Equals("uid-1"); // check if the Submit form button is displayed or not + var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1"); // check if the Submit form button is displayed or not var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // set the mode parameter: change it to view if the document can't be edited // favorite icon state diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index 2eec1913..dade52b3 100755 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -154,7 +154,7 @@ namespace OnlineEditorsExample editorsMode = "fillForms"; canEdit = true; } - var submitForm = user.id.Equals("uid-1"); // check if the Submit form button is displayed or hidden + var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1"); // check if the Submit form button is displayed or hidden var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // get the editor opening mode (edit or view) var jss = new JavaScriptSerializer(); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/sdk/service/ConfigServiceImpl.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/sdk/service/ConfigServiceImpl.java index df14fe0b..c6632939 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/sdk/service/ConfigServiceImpl.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/sdk/service/ConfigServiceImpl.java @@ -93,7 +93,8 @@ public class ConfigServiceImpl extends DefaultConfigService implements ConfigSer Config config = super.createConfig(fileId, mode, type); - if (appUser.getPermissions().getSubmitForm()) { + if (!currentAction.equals(Action.view) + && appUser.getPermissions().getSubmitForm()) { config.getEditorConfig().getCustomization().setSubmitForm(true); } diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java index f0604a33..1819ef61 100755 --- a/web/documentserver-example/java/src/main/java/entities/FileModel.java +++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java @@ -164,7 +164,9 @@ public class FileModel { } // check if the Submit form button is displayed or not - editorConfig.getCustomization().setSubmitForm(user.getId().equals("uid-1")); + if (!mode.equals("view")) { + editorConfig.getCustomization().setSubmitForm(user.getId().equals("uid-1")); + } if ((!canEdit && mode.equals("edit") || mode.equals("fillForms")) && canFill) { canEdit = true; diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 0d5c5365..47e5998d 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -1114,7 +1114,10 @@ app.get('/editor', (req, res) => { // define a handler for editing document mode = 'view'; } - const submitForm = userid === 'uid-1'; + let submitForm = false; + if (mode !== 'view') { + submitForm = userid === 'uid-1'; + } if (user.goback != null) { user.goback.url = `${req.DocManager.getServerUrl()}`; diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index deb28b7a..f0cf0cf4 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -83,7 +83,7 @@ final class DocEditorView extends View } // check if the Submit form button is displayed or not - $submitForm = $user->id == "uid-1"; + $submitForm = $editorsMode != "view" && $user->id == "uid-1"; $mode = $canEdit && $editorsMode != "view" ? "edit" : "view"; // define if the editing mode is edit or view $type = empty($request["type"]) ? "desktop" : $request["type"]; diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index fdd06f8a..ac68f3ab 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -207,7 +207,7 @@ def edit(request): edMode = 'fillForms' canEdit = True # if the Submit form button is displayed or hidden - submitForm = user.id == 'uid-1' + submitForm = edMode != 'view' and user.id == 'uid-1' mode = 'edit' if canEdit & (edMode != 'view') else 'view' # if the file can't be edited, the mode is view types = ['desktop', 'mobile', 'embedded'] diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 4702b5d4..4019427f 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -106,7 +106,7 @@ class FileModel editors_mode = 'fillForms' can_edit = true end - submit_form = @user.id.eql?('uid-1') # Submit form button state + submit_form = !editors_mode.eql?('view') && @user.id.eql?('uid-1') # Submit form button state mode = can_edit && !editors_mode.eql?('view') ? 'edit' : 'view' # templates image url in the "From Template" section templates_image_url = DocumentHelper.get_template_image_url(document_type)