Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use a standalone struct name for Organization #17632

Merged
merged 12 commits into from
Nov 19, 2021
Merged

Use a standalone struct name for Organization #17632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1e7e5a7
Use a standalone struct name for Organization
lunny Nov 13, 2021
6e8e538
recover unnecessary change
lunny Nov 13, 2021
42c7ca2
make the code readable
lunny Nov 13, 2021
f75a50f
Fix template failure
lunny Nov 13, 2021
6d314c4
Fix template failure
lunny Nov 13, 2021
abda1c6
Move HasMemberWithUserID to org
lunny Nov 14, 2021
f8c4fc9
Fix test
lunny Nov 14, 2021
48c40c6
Remove unnecessary user type check
lunny Nov 18, 2021
61d7ece
Fix test
lunny Nov 19, 2021
40ad8ef
Merge branch 'main' into lunny/org
lunny Nov 19, 2021
2146a31
Merge branch 'main' into lunny/org
wxiaoguang Nov 19, 2021
f8c3c82
Merge branch 'main' into lunny/org
wxiaoguang Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions models/access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,12 @@ func (repo *Repository) recalculateTeamAccesses(e db.Engine, ignTeamID int64) (e
return fmt.Errorf("refreshCollaboratorAccesses: %v", err)
}

if err = repo.Owner.loadTeams(e); err != nil {
teams, err := OrgFromUser(repo.Owner).loadTeams(e)
if err != nil {
return err
}

for _, t := range repo.Owner.Teams {
for _, t := range teams {
if t.ID == ignTeamID {
continue
}
Expand Down
4 changes: 2 additions & 2 deletions models/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) {
// check readable repositories by doer/actor
if opts.Actor == nil || !opts.Actor.IsAdmin {
if opts.RequestedUser.IsOrganization() {
env, err := opts.RequestedUser.AccessibleReposEnv(actorID)
env, err := OrgFromUser(opts.RequestedUser).AccessibleReposEnv(actorID)
if err != nil {
return nil, fmt.Errorf("AccessibleReposEnv: %v", err)
}
Expand All @@ -366,7 +366,7 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) {
}

if opts.RequestedTeam != nil {
env := opts.RequestedUser.AccessibleTeamReposEnv(opts.RequestedTeam)
env := OrgFromUser(opts.RequestedUser).AccessibleTeamReposEnv(opts.RequestedTeam)
teamRepoIDs, err := env.RepoIDs(1, opts.RequestedUser.NumRepos)
if err != nil {
return nil, fmt.Errorf("GetTeamRepositories: %v", err)
Expand Down
Loading