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

renamed parameter reviewGroup on reviewGroups

Browse Source
This commit is contained in:
Alexandr Fedorov
2021-02-17 10:11:36 +03:00
parent 61c388a7af
commit 4ccd78053f
8 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,16 +72,16 @@ namespace OnlineEditorsExampleMVC.Models
var userId = request.Cookies.GetOrDefault("uid", "uid-1");
string userGroup = null;
List<string> reviewGroup = null;
List<string> reviewGroups = null;
if (userId.Equals("uid-2"))
{
userGroup = "group-2";
reviewGroup = new List<string>() { "group-2", "" };
reviewGroups = new List<string>() { "group-2", "" };
}
if (userId.Equals("uid-3"))
{
userGroup = "group-3";
reviewGroup = new List<string>() { "group-2" };
reviewGroups = new List<string>() { "group-2" };
}
object favorite = null;
@ -122,7 +122,7 @@ namespace OnlineEditorsExampleMVC.Models
{ "modifyFilter", editorsMode != "filter" },
{ "modifyContentControl", editorsMode != "blockcontent" },
{ "review", editorsMode == "edit" || editorsMode == "review" },
{ "reviewGroup", reviewGroup }
{ "reviewGroups", reviewGroups }
}
}
}

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

@ -109,16 +109,16 @@ namespace OnlineEditorsExample
var userId = Request.Cookies.GetOrDefault("uid", "uid-1");
string userGroup = null;
List<string> reviewGroup = null;
List<string> reviewGroups = null;
if (userId.Equals("uid-2"))
{
userGroup = "group-2";
reviewGroup = new List<string>() { "group-2", "" };
reviewGroups = new List<string>() { "group-2", "" };
}
if (userId.Equals("uid-3"))
{
userGroup = "group-3";
reviewGroup = new List<string>() { "group-2" };
reviewGroups = new List<string>() { "group-2" };
}
var jss = new JavaScriptSerializer();
@ -161,7 +161,7 @@ namespace OnlineEditorsExample
{ "modifyFilter", editorsMode != "filter" },
{ "modifyContentControl", editorsMode != "blockcontent" },
{ "review", editorsMode == "edit" || editorsMode == "review" },
{ "reviewGroup", reviewGroup }
{ "reviewGroups", reviewGroups }
}
}
}

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

@ -213,7 +213,7 @@ public class FileModel
public Boolean modifyFilter;
public Boolean modifyContentControl;
public Boolean review;
public List<String> reviewGroup;
public List<String> reviewGroups;
public Permissions(String mode, String type, Boolean canEdit)
{
@ -224,10 +224,10 @@ public class FileModel
modifyFilter = !mode.equals("filter");
modifyContentControl = !mode.equals("blockcontent");
review = mode.equals("edit") || mode.equals("review");
reviewGroup = editorConfig.user.group != null ? GetReviewGroup(editorConfig.user.group) : null;
reviewGroups = editorConfig.user.group != null ? GetReviewGroups(editorConfig.user.group) : null;
}
private List<String> GetReviewGroup(String group){
private List<String> GetReviewGroups(String group){
Map<String, List<String>> reviewGroups = new HashMap<>();
reviewGroups.put("group-2", Arrays.asList("group-2", ""));

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

@ -555,16 +555,16 @@ app.get("/editor", function (req, res) {
var actionData = req.query.action ? req.query.action : "null";
var userGroup = null;
var reviewGroup = null;
var reviewGroups = null;
if (userid == "uid-2")
{
userGroup = "group-2";
// own and without group
reviewGroup = ["group-2", ""];
reviewGroups = ["group-2", ""];
} else if (userid == "uid-3") {
userGroup = "group-3";
// other group only
reviewGroup = ["group-2"];
reviewGroups = ["group-2"];
}
if (fileExt != null) {
@ -678,7 +678,7 @@ app.get("/editor", function (req, res) {
userid: userid,
name: name,
userGroup: userGroup,
reviewGroup: JSON.stringify(reviewGroup),
reviewGroups: JSON.stringify(reviewGroups),
fileChoiceUrl: fileChoiceUrl,
plugins: JSON.stringify(plugins),
actionData: actionData

2
web/documentserver-example/nodejs/views/config.ejs
View File

@ -21,7 +21,7 @@
"modifyFilter": <%- editor.modifyFilter %>,
"modifyContentControl": <%- editor.modifyContentControl %>,
"review": <%- editor.review %>,
"reviewGroup": <%- editor.reviewGroup %>
"reviewGroups": <%- editor.reviewGroups %>
}
},
"editorConfig": {

6
web/documentserver-example/php/doceditor.php
View File

@ -58,12 +58,12 @@
case 1:
$uname = "Mark Pottato";
$ugroup = "group-2";
$reviewGroup = ["group-2", ""];
$reviewGroups = ["group-2", ""];
break;
case 2:
$uname = "Hamish Mitchell";
$ugroup = "group-3";
$reviewGroup = ["group-2"];
$reviewGroups = ["group-2"];
break;
}
@ -92,7 +92,7 @@
"modifyFilter" => $editorsMode != "filter",
"modifyContentControl" => $editorsMode != "blockcontent",
"review" => $editorsMode == "edit" || $editorsMode == "review",
"reviewGroup" => $reviewGroup
"reviewGroups" => $reviewGroups
]
],
"editorConfig" => [

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

@ -120,13 +120,13 @@ def edit(request):
fileType = fileUtils.getFileType(filename)
user = users.getUserFromReq(request)
userGroup = None
reviewGroup = None
reviewGroups = None
if (user['uid'] == 'uid-2'):
userGroup = 'group-2'
reviewGroup = ['group-2', '']
reviewGroups = ['group-2', '']
if (user['uid'] == 'uid-3'):
userGroup = 'group-3'
reviewGroup = ['group-2']
reviewGroups = ['group-2']
edMode = request.GET.get('mode') if request.GET.get('mode') else 'edit'
canEdit = docManager.isCanEdit(ext)
@ -170,7 +170,7 @@ def edit(request):
'modifyFilter': edMode != 'filter',
'modifyContentControl': edMode != "blockcontent",
'review': (edMode == 'edit') | (edMode == 'review'),
'reviewGroup': reviewGroup
'reviewGroups': reviewGroups
}
},
'editorConfig': {

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

@ -69,14 +69,14 @@ class FileModel
mode = canEdit && editorsmode.eql?("view") ? "view" : "edit"
userId = @user_id ? @user_id : "uid-1"
userGroup = nil;
reviewGroup = nil;
reviewGroups = nil;
if (userId == "uid-2")
userGroup = "group-2";
reviewGroup = ["group-2", ""];
reviewGroups = ["group-2", ""];
end
if (userId == "uid-3")
userGroup = "group-3";
reviewGroup = ["group-2"];
reviewGroups = ["group-2"];
end
config = {
@ -100,7 +100,7 @@ class FileModel
:modifyFilter => !editorsmode.eql?("filter"),
:modifyContentControl => !editorsmode.eql?("blockcontent"),
:review => editorsmode.eql?("edit") || editorsmode.eql?("review"),
:reviewGroup => reviewGroup
:reviewGroups => reviewGroups
}
},
:editorConfig => {