core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix that owners also see actions on their repositories 

This is a balance between speed and nice code, where speed has won. To prevent a repository query for each action the ownername is match with the current user.

It would be "cleaner" or "better" if we fetch the repository each time. Another option is to add the RepoOwnerID to action
This commit is contained in:
Peter Smit 2015-02-16 13:16:24 +02:00
parent cd6a2b78a7
commit 455fad0fbd
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
routers/user/home.go
View File

@ -103,7 +103,12 @@ func Dashboard(ctx *middleware.Context) {
feeds := make([]*models.Action, 0, len(actions)) feeds := make([]*models.Action, 0, len(actions))
for _, act := range actions { for _, act := range actions {
if act.IsPrivate { if act.IsPrivate {
if has, _ := models.HasAccess(ctx.User, &models.Repository{Id: act.RepoId, IsPrivate: true}, models.ACCESS_MODE_READ); !has { repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
// This prevents having to retrieve the repository for each action
if act.RepoUserName == ctx.User.LowerName {
repo.OwnerId = ctx.User.Id
}
if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
continue continue
} }
} }
@ -210,11 +215,12 @@ func Profile(ctx *middleware.Context) {
if !ctx.IsSigned { if !ctx.IsSigned {
continue continue
} }
if has, _ := models.HasAccess(ctx.User, repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
&models.Repository{ // This prevents having to retrieve the repository for each action
Id: act.RepoId, if act.RepoUserName == ctx.User.LowerName {
IsPrivate: true, repo.OwnerId = ctx.User.Id
}, models.ACCESS_MODE_READ); !has { }
if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
continue continue
} }
} }