Skip to content

Commit 585dd13

Browse files
lunnytechknowlogick
authored andcommitted
fix bug when update owner team then visit team's repo return 404 (#6119) (#6166)
1 parent 12d8834 commit 585dd13

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

models/repo_permission.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,15 @@ func getUserRepoPermission(e Engine, repo *Repository, user *User) (perm Permiss
151151
return
152152
}
153153

154+
// if user in an owner team
155+
for _, team := range teams {
156+
if team.Authorize >= AccessModeOwner {
157+
perm.AccessMode = AccessModeOwner
158+
perm.UnitsMode = nil
159+
return
160+
}
161+
}
162+
154163
for _, u := range repo.Units {
155164
var found bool
156165
for _, team := range teams {

models/repo_permission_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,17 @@ func TestRepoPermissionPrivateOrgRepo(t *testing.T) {
219219
assert.True(t, perm.CanWrite(unit.Type))
220220
}
221221

222+
// update team information and then check permission
223+
team := AssertExistsAndLoadBean(t, &Team{ID: 5}).(*Team)
224+
err = UpdateTeamUnits(team, nil)
225+
assert.NoError(t, err)
226+
perm, err = GetUserRepoPermission(repo, owner)
227+
assert.NoError(t, err)
228+
for _, unit := range repo.Units {
229+
assert.True(t, perm.CanRead(unit.Type))
230+
assert.True(t, perm.CanWrite(unit.Type))
231+
}
232+
222233
// org member team tester
223234
tester := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
224235
perm, err = GetUserRepoPermission(repo, tester)

routers/org/teams.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,6 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
288288
})
289289
}
290290
models.UpdateTeamUnits(t, units)
291-
} else {
292-
models.UpdateTeamUnits(t, nil)
293291
}
294292

295293
if ctx.HasError() {

0 commit comments

Comments
 (0)