summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-05-08 19:17:43 -0400
committerUnknown <joe2010xtmf@163.com>2014-05-08 19:17:43 -0400
commit914ffa496f8e8e9948ca8c5596da6b0d3c17555d (patch)
tree5f2fc88ee51db05013f968031bc8340f4867f48d /models
parenta742ee543ef3faf6374625c9c6d065c0a46b5549 (diff)
downloadgitea-914ffa496f8e8e9948ca8c5596da6b0d3c17555d.tar.gz
gitea-914ffa496f8e8e9948ca8c5596da6b0d3c17555d.zip
Show private repository activities in dashboard if has access
Diffstat (limited to 'models')
-rw-r--r--models/access.go3
-rw-r--r--models/action.go4
2 files changed, 5 insertions, 2 deletions
diff --git a/models/access.go b/models/access.go
index 4f944517ed..4a202dc6bc 100644
--- a/models/access.go
+++ b/models/access.go
@@ -60,6 +60,9 @@ func UpdateAccessWithSession(sess *xorm.Session, access *Access) error {
// HasAccess returns true if someone can read or write to given repository.
// The repoName should be in format <username>/<reponame>.
func HasAccess(uname, repoName string, mode int) (bool, error) {
+ if len(repoName) == 0 {
+ return false, nil
+ }
access := &Access{
UserName: strings.ToLower(uname),
RepoName: strings.ToLower(repoName),
diff --git a/models/action.go b/models/action.go
index 02639e5538..6c18d022d0 100644
--- a/models/action.go
+++ b/models/action.go
@@ -198,8 +198,8 @@ func TransferRepoAction(user, newUser *User, repo *Repository) (err error) {
}
// GetFeeds returns action list of given user in given context.
-func GetFeeds(userid, offset int64, isProfile bool) ([]Action, error) {
- actions := make([]Action, 0, 20)
+func GetFeeds(userid, offset int64, isProfile bool) ([]*Action, error) {
+ actions := make([]*Action, 0, 20)
sess := orm.Limit(20, int(offset)).Desc("id").Where("user_id=?", userid)
if isProfile {
sess.Where("is_private=?", false).And("act_user_id=?", userid)