Commitef15908

committed

fix rbac merge woes

1 parent5c6344f commitef15908Copy full SHA for ef15908

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -398,12 +398,12 @@ func roleSplit(role string) (name string, orgID string, err error) {`
`398`	`398`	`// and actions a bit easier.`
`399`	`399`	`funcpermissions(permsmap[string][]Action) []Permission {`
`400`	`400`	`list:=make([]Permission,0,len(perms))`
`401`		`-forobjectType,actions:=rangeperms {`
	`401`	`+fork,actions:=rangeperms {`
`402`	`402`	`for_,act:=rangeactions {`
`403`	`403`	`act:=act`
`404`	`404`	`list=append(list,Permission{`
`405`	`405`	`Negate:false,`
`406`		`-ResourceType:objectType,`
	`406`	`+ResourceType:k,`
`407`	`407`	`Action:act,`
`408`	`408`	`})`
`409`	`409`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ var builtinScopes map[Scope]Role = map[Scope]Role{`
`19`	`19`	`ScopeAll: {`
`20`	`20`	`Name:fmt.Sprintf("Scope_%s",ScopeAll),`
`21`	`21`	`DisplayName:"All operations",`
`22`		`-Site:permissions(map[Object][]Action{`
`23`		`-ResourceWildcard: {WildcardSymbol},`
	`22`	`+Site:permissions(map[string][]Action{`
	`23`	`+ResourceWildcard.Type: {WildcardSymbol},`
`24`	`24`	`}),`
`25`	`25`	`Org:map[string][]Permission{},`
`26`	`26`	`User: []Permission{},`
`@@ -29,8 +29,8 @@ var builtinScopes map[Scope]Role = map[Scope]Role{`
`29`	`29`	`ScopeApplicationConnect: {`
`30`	`30`	`Name:fmt.Sprintf("Scope_%s",ScopeApplicationConnect),`
`31`	`31`	`DisplayName:"Ability to connect to applications",`
`32`		`-Site:permissions(map[Object][]Action{`
`33`		`-ResourceWorkspaceApplicationConnect: {ActionCreate},`
	`32`	`+Site:permissions(map[string][]Action{`
	`33`	`+ResourceWorkspaceApplicationConnect.Type: {ActionCreate},`
`34`	`34`	`}),`
`35`	`35`	`Org:map[string][]Permission{},`
`36`	`36`	`User: []Permission{},`

Comments

(0)