Skip to content
Snippets Groups Projects
Commit 0767abad authored by ko_oler's avatar ko_oler
Browse files

правки после обновления perxis-proto

parent 834397a3
No related branches found
No related tags found
No related merge requests found
......@@ -136,8 +136,8 @@ func PtrPermissionRuleToProto(rule *permission.Rule) (*commonpb.Rule, error) {
Actions: actions,
Access: commonpb.Access(rule.Access),
HiddenFields: rule.HiddenFields,
ReadonlyFields: rule.DenyReadFields,
WriteonlyFields: rule.DenyWriteFields,
ReadonlyFields: rule.DenyWriteFields,
WriteonlyFields: rule.DenyReadFields,
ReadFilter: rule.ReadFilter,
WriteFilter: rule.WriteFilter,
DenyReadFields: rule.DenyReadFields,
......@@ -153,7 +153,7 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
for _, a := range protoRule.Actions {
actions = append(actions, permission.Action(a))
}
return &permission.Rule{
r := &permission.Rule{
CollectionID: protoRule.CollectionId,
Actions: actions,
Access: permission.Access(protoRule.Access),
......@@ -162,5 +162,12 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
DenyWriteFields: protoRule.DenyWriteFields,
ReadFilter: protoRule.ReadFilter,
WriteFilter: protoRule.WriteFilter,
}, nil
}
if len(r.DenyReadFields) == 0 {
r.DenyReadFields = protoRule.WriteonlyFields
}
if len(r.DenyWriteFields) == 0 {
r.DenyWriteFields = protoRule.ReadonlyFields
}
return r, nil
}
......@@ -56,8 +56,8 @@ func PtrCollectionToProto(coll *service.Collection) (*pb.Collection, error) {
HiddenFields: coll.Access.HiddenFields,
ReadonlyFields: coll.Access.DenyReadFields,
WriteonlyFields: coll.Access.DenyWriteFields,
DenyReadFields: coll.Access.DenyReadFields,
DenyWriteFields: coll.Access.DenyWriteFields,
DenyReadFields: coll.Access.DenyWriteFields,
DenyWriteFields: coll.Access.DenyReadFields,
}
}
protoCollection := &pb.Collection{
......@@ -117,6 +117,12 @@ func ProtoToPtrCollection(protoCollection *pb.Collection) (*service.Collection,
DenyReadFields: protoCollection.Access.DenyReadFields,
DenyWriteFields: protoCollection.Access.DenyWriteFields,
}
if len(access.DenyReadFields) == 0 {
access.DenyReadFields = protoCollection.Access.WriteonlyFields
}
if len(access.DenyWriteFields) == 0 {
access.DenyWriteFields = protoCollection.Access.ReadonlyFields
}
}
collection := &service.Collection{
ID: protoCollection.Id,
......
......@@ -82,8 +82,8 @@ func PtrPermissionRuleToProto(rule *permission.Rule) (*commonpb.Rule, error) {
Actions: actions,
Access: commonpb.Access(rule.Access),
HiddenFields: rule.HiddenFields,
ReadonlyFields: rule.DenyReadFields,
WriteonlyFields: rule.DenyWriteFields,
ReadonlyFields: rule.DenyWriteFields,
WriteonlyFields: rule.DenyReadFields,
ReadFilter: rule.ReadFilter,
WriteFilter: rule.WriteFilter,
DenyReadFields: rule.DenyReadFields,
......@@ -99,7 +99,7 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
for _, a := range protoRule.Actions {
actions = append(actions, permission.Action(a))
}
return &permission.Rule{
r := &permission.Rule{
CollectionID: protoRule.CollectionId,
Actions: actions,
Access: permission.Access(protoRule.Access),
......@@ -108,5 +108,12 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
DenyWriteFields: protoRule.DenyWriteFields,
ReadFilter: protoRule.ReadFilter,
WriteFilter: protoRule.WriteFilter,
}, nil
}
if len(r.DenyReadFields) == 0 {
r.DenyReadFields = protoRule.WriteonlyFields
}
if len(r.DenyWriteFields) == 0 {
r.DenyWriteFields = protoRule.ReadonlyFields
}
return r, nil
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment