TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-18 00:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new-eventstore

Browse Source
This commit is contained in:
adlerhurst
2020-11-19 17:20:09 +01:00
parent 4d6497f6c1 fcf81bed5f
commit 609c4d4f24
86 changed files with 294 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/management/repository/eventsourcing/eventstore/user_grant.go
View File

@@ -2,6 +2,7 @@ package eventstore
import (
"context"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/api/authz"
caos_errors "github.com/caos/zitadel/internal/errors"

1
internal/management/repository/eventsourcing/handler/user_grant.go
View File

@@ -176,6 +176,7 @@ func (u *UserGrant) fillUserData(grant *view_model.UserGrantView, user *usr_mode
func (u *UserGrant) fillProjectData(grant *view_model.UserGrantView, project *proj_model.Project) {
grant.ProjectName = project.Name
grant.ProjectOwner = project.ResourceOwner
}
func (u *UserGrant) fillOrgData(grant *view_model.UserGrantView, org *org_model.Org) {