diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index bad5702c..4ba71df7 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -144,7 +144,7 @@ namespace OnlineEditorsExampleMVC.Models { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" }, { "modifyFilter", editorsMode != "filter" }, { "modifyContentControl", editorsMode != "blockcontent" }, - { "review", editorsMode == "edit" || editorsMode == "review" }, + { "review", canEdit && (editorsMode == "edit" || editorsMode == "review") }, { "reviewGroups", reviewGroups } } } diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index a042bb13..db8733aa 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -208,7 +208,7 @@ namespace OnlineEditorsExample { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" }, { "modifyFilter", editorsMode != "filter" }, { "modifyContentControl", editorsMode != "blockcontent" }, - { "review", editorsMode == "edit" || editorsMode == "review" }, + { "review", canEdit && (editorsMode == "edit" || editorsMode == "review") }, { "reviewGroups", reviewGroups } } } 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 17141cdc..b8ef4a1b 100644 --- a/web/documentserver-example/java/src/main/java/entities/FileModel.java +++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java @@ -254,7 +254,7 @@ public class FileModel fillForms = !mode.equals("view") && !mode.equals("comment") && !mode.equals("embedded") && !mode.equals("blockcontent"); modifyFilter = !mode.equals("filter"); modifyContentControl = !mode.equals("blockcontent"); - review = mode.equals("edit") || mode.equals("review"); + review = canEdit && (mode.equals("edit") || mode.equals("review")); reviewGroups = editorConfig.user.group != null ? GetReviewGroups(editorConfig.user.group) : null; } diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 7cdacc3b..34fe3944 100644 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -750,7 +750,7 @@ app.get("/editor", function (req, res) { // define a handler for editing docume callbackUrl: docManager.getCallback(fileName), createUrl: docManager.getCreateUrl(fileUtility.getFileType(fileName), userid, name, type, lang), isEdit: canEdit && (mode == "edit" || mode == "view" || mode == "filter" || mode == "blockcontent"), - review: mode == "edit" || mode == "review", + review: canEdit && (mode == "edit" || mode == "review"), comment: mode != "view" && mode != "fillForms" && mode != "embedded" && mode != "blockcontent", fillForms: mode != "view" && mode != "comment" && mode != "embedded" && mode != "blockcontent", modifyFilter: mode != "filter", diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php index 0324c899..72c88efa 100644 --- a/web/documentserver-example/php/doceditor.php +++ b/web/documentserver-example/php/doceditor.php @@ -104,7 +104,7 @@ "fillForms" => $editorsMode != "view" && $editorsMode != "comment" && $editorsMode != "embedded" && $editorsMode != "blockcontent", "modifyFilter" => $editorsMode != "filter", "modifyContentControl" => $editorsMode != "blockcontent", - "review" => $editorsMode == "edit" || $editorsMode == "review", + "review" => $canEdit && ($editorsMode == "edit" || $editorsMode == "review"), "reviewGroups" => $reviewGroups ] ], diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 9cee4778..c0cbcd56 100644 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -179,7 +179,7 @@ def edit(request): 'fillForms': (edMode != 'view') & (edMode != 'comment') & (edMode != 'embedded') & (edMode != "blockcontent"), 'modifyFilter': edMode != 'filter', 'modifyContentControl': edMode != "blockcontent", - 'review': (edMode == 'edit') | (edMode == 'review'), + 'review': canEdit & ((edMode == 'edit') | (edMode == 'review')), 'reviewGroups': reviewGroups } }, diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 1e867434..b3499155 100644 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -84,7 +84,7 @@ class FileModel editorsmode = @mode ? @mode : "edit" # mode: view/edit/review/comment/fillForms/embedded canEdit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited submitForm = canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("fillForms")) # the Submit form button state - mode = canEdit && editorsmode.eql?("view") ? "view" : "edit" + mode = canEdit && !editorsmode.eql?("view") ? "edit" : "view" userId = @user_id ? @user_id : "uid-1" user_name = (userId.eql?("uid-0") ? nil : (@user_name ? @user_name : "John Smith")) userGroup = nil @@ -120,7 +120,7 @@ class FileModel :fillForms => !editorsmode.eql?("view") && !editorsmode.eql?("comment") && !editorsmode.eql?("embedded") && !editorsmode.eql?("blockcontent"), :modifyFilter => !editorsmode.eql?("filter"), :modifyContentControl => !editorsmode.eql?("blockcontent"), - :review => editorsmode.eql?("edit") || editorsmode.eql?("review"), + :review => canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("review")), :reviewGroups => reviewGroups } },