Skip to content

Commit 7a03473

Browse files
lunnywxiaoguang
andauthored
Use a standalone struct name for Organization (#17632)
* Use a standalone struct name for Organization * recover unnecessary change * make the code readable * Fix template failure * Fix template failure * Move HasMemberWithUserID to org * Fix test * Remove unnecessary user type check * Fix test Co-authored-by: wxiaoguang <[email protected]>
1 parent a09b40d commit 7a03473

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+335
-259
lines changed

models/access.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,12 @@ func (repo *Repository) recalculateTeamAccesses(e db.Engine, ignTeamID int64) (e
254254
return fmt.Errorf("refreshCollaboratorAccesses: %v", err)
255255
}
256256

257-
if err = repo.Owner.loadTeams(e); err != nil {
257+
teams, err := OrgFromUser(repo.Owner).loadTeams(e)
258+
if err != nil {
258259
return err
259260
}
260261

261-
for _, t := range repo.Owner.Teams {
262+
for _, t := range teams {
262263
if t.ID == ignTeamID {
263264
continue
264265
}

models/action.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) {
352352
// check readable repositories by doer/actor
353353
if opts.Actor == nil || !opts.Actor.IsAdmin {
354354
if opts.RequestedUser.IsOrganization() {
355-
env, err := opts.RequestedUser.AccessibleReposEnv(actorID)
355+
env, err := OrgFromUser(opts.RequestedUser).AccessibleReposEnv(actorID)
356356
if err != nil {
357357
return nil, fmt.Errorf("AccessibleReposEnv: %v", err)
358358
}
@@ -366,7 +366,7 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) {
366366
}
367367

368368
if opts.RequestedTeam != nil {
369-
env := opts.RequestedUser.AccessibleTeamReposEnv(opts.RequestedTeam)
369+
env := OrgFromUser(opts.RequestedUser).AccessibleTeamReposEnv(opts.RequestedTeam)
370370
teamRepoIDs, err := env.RepoIDs(1, opts.RequestedUser.NumRepos)
371371
if err != nil {
372372
return nil, fmt.Errorf("GetTeamRepositories: %v", err)

0 commit comments

Comments
 (0)