mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
parent
0239cf8766
commit
6b218b11cf
@ -104,7 +104,6 @@ func (s *store) setUserResourcePermission(
|
|||||||
cmd SetResourcePermissionCommand,
|
cmd SetResourcePermissionCommand,
|
||||||
hook UserResourceHookFunc,
|
hook UserResourceHookFunc,
|
||||||
) (*accesscontrol.ResourcePermission, error) {
|
) (*accesscontrol.ResourcePermission, error) {
|
||||||
fmt.Printf("setting user resource permission %v\n", cmd)
|
|
||||||
permission, err := s.setResourcePermission(sess, orgID, accesscontrol.ManagedUserRoleName(user.ID), s.userAdder(sess, orgID, user.ID), cmd)
|
permission, err := s.setResourcePermission(sess, orgID, accesscontrol.ManagedUserRoleName(user.ID), s.userAdder(sess, orgID, user.ID), cmd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -238,7 +237,6 @@ type roleAdder func(roleID int64) error
|
|||||||
func (s *store) setResourcePermission(
|
func (s *store) setResourcePermission(
|
||||||
sess *db.Session, orgID int64, roleName string, adder roleAdder, cmd SetResourcePermissionCommand,
|
sess *db.Session, orgID int64, roleName string, adder roleAdder, cmd SetResourcePermissionCommand,
|
||||||
) (*accesscontrol.ResourcePermission, error) {
|
) (*accesscontrol.ResourcePermission, error) {
|
||||||
fmt.Printf("setting resource permission %v\n", cmd)
|
|
||||||
role, err := s.getOrCreateManagedRole(sess, orgID, roleName, adder)
|
role, err := s.getOrCreateManagedRole(sess, orgID, roleName, adder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -778,7 +776,6 @@ func (s *InMemoryActionSets) StoreActionSet(resource, permission string, actions
|
|||||||
Actions: actions,
|
Actions: actions,
|
||||||
}
|
}
|
||||||
s.actionSets[actionSet.Action] = actions
|
s.actionSets[actionSet.Action] = actions
|
||||||
fmt.Printf("stored action set actionname %s\n", s.actionSets)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetActionSetName function creates an action set from a list of actions and stores it inmemory.
|
// GetActionSetName function creates an action set from a list of actions and stores it inmemory.
|
||||||
|
Loading…
Reference in New Issue
Block a user