Skip to content
Snippets Groups Projects
Commit 33834a02 authored by Anton Sattarov's avatar Anton Sattarov
Browse files

fix

parent 33b39884
No related branches found
No related tags found
No related merge requests found
......@@ -127,10 +127,10 @@ func (r Rule) GetPermission(action Action) *Permission {
case ActionRead:
p.Filter = r.ReadFilter
p.UnallowedFields = append(p.UnallowedFields, r.HiddenFields...)
p.UnallowedFields = append(p.UnallowedFields, data.Difference(r.WriteonlyFields, r.ReadonlyFields)...)
p.UnallowedFields = append(p.UnallowedFields, r.WriteonlyFields...)
case ActionCreate, ActionUpdate, ActionDelete:
p.Filter = r.WriteFilter
p.UnallowedFields = append(p.UnallowedFields, data.Difference(r.ReadonlyFields, r.WriteonlyFields)...)
p.UnallowedFields = append(p.UnallowedFields, r.ReadonlyFields...)
}
p.UnallowedFields = data.SetFromSlice(p.UnallowedFields)
......
......@@ -68,7 +68,7 @@ func TestRule_GetPermission(t *testing.T) {
name: "ActionRead readonly&writeonly",
action: ActionRead,
rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, ReadonlyFields: []string{"f1"}, HiddenFields: []string{"f2"}, WriteonlyFields: []string{"f1"}},
unallowedFields: []string{"f2"},
unallowedFields: []string{"f1", "f2"},
},
{
name: "ActionUpdate",
......@@ -80,7 +80,7 @@ func TestRule_GetPermission(t *testing.T) {
name: "ActionUpdate readonly&writeonly",
action: ActionUpdate,
rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, ReadonlyFields: []string{"f1"}, HiddenFields: []string{"f2"}, WriteonlyFields: []string{"f1"}},
unallowedFields: []string{},
unallowedFields: []string{"f1"},
},
}
for _, tt := range tests {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment