mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-29 22:24:18 -04:00
Update/simplify fix that owners also see actions on their repositories
This commit is contained in:
parent
455fad0fbd
commit
0fa209d07b
@ -103,14 +103,14 @@ 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 {
|
||||||
repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
|
|
||||||
// This prevents having to retrieve the repository for each action
|
// This prevents having to retrieve the repository for each action
|
||||||
if act.RepoUserName == ctx.User.LowerName {
|
repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
|
||||||
repo.OwnerId = ctx.User.Id
|
if act.RepoUserName != ctx.User.LowerName {
|
||||||
}
|
if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
|
||||||
if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
|
continue
|
||||||
continue
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
// FIXME: cache results?
|
// FIXME: cache results?
|
||||||
u, err := models.GetUserByName(act.ActUserName)
|
u, err := models.GetUserByName(act.ActUserName)
|
||||||
@ -215,14 +215,14 @@ func Profile(ctx *middleware.Context) {
|
|||||||
if !ctx.IsSigned {
|
if !ctx.IsSigned {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
|
|
||||||
// This prevents having to retrieve the repository for each action
|
// This prevents having to retrieve the repository for each action
|
||||||
if act.RepoUserName == ctx.User.LowerName {
|
repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
|
||||||
repo.OwnerId = ctx.User.Id
|
if act.RepoUserName != ctx.User.LowerName {
|
||||||
}
|
if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
|
||||||
if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
|
continue
|
||||||
continue
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
// FIXME: cache results?
|
// FIXME: cache results?
|
||||||
u, err := models.GetUserByName(act.ActUserName)
|
u, err := models.GetUserByName(act.ActUserName)
|
||||||
|
Loading…
Reference in New Issue
Block a user