From: Peter Smit <peter@smitmail.eu>
Date: Mon, 16 Feb 2015 11:16:24 +0000 (+0200)
Subject: Fix that owners also see actions on their repositories
X-Git-Tag: v0.9.99~1438^2~4^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=455fad0fbd85137af5d3efec93d2b974e9383b98;p=gitea.git

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
---

diff --git a/routers/user/home.go b/routers/user/home.go
index 35407534f9..574c6387dc 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -103,7 +103,12 @@ func Dashboard(ctx *middleware.Context) {
 	feeds := make([]*models.Action, 0, len(actions))
 	for _, act := range actions {
 		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
 			}
 		}
@@ -210,11 +215,12 @@ func Profile(ctx *middleware.Context) {
 				if !ctx.IsSigned {
 					continue
 				}
-				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
 				}
 			}