From bafd778c259801f0ceef1f621851afd43eabc3a5 Mon Sep 17 00:00:00 2001
From: Ethan Koenig <etk39@cornell.edu>
Date: Fri, 26 May 2017 23:34:11 -0400
Subject: [PATCH] Fix invalid reference in feeds template (#1820)
* Fix invalid reference in feeds template
* Comment for GetActAvatar
* Add integration test
---
integrations/issue_test.go | 9 +++++++++
models/action.go | 6 ++++++
templates/user/dashboard/feeds.tmpl | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/integrations/issue_test.go b/integrations/issue_test.go
index 61ddc12adb..51fcc96f8c 100644
--- a/integrations/issue_test.go
+++ b/integrations/issue_test.go
@@ -11,6 +11,15 @@ import (
"github.com/stretchr/testify/assert"
)
+func TestNoLoginViewIssues(t *testing.T) {
+ prepareTestEnv(t)
+
+ req, err := http.NewRequest("GET", "/user2/repo1/issues", nil)
+ assert.NoError(t, err)
+ resp := MakeRequest(req)
+ assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
+}
+
func TestNoLoginViewIssue(t *testing.T) {
prepareTestEnv(t)
diff --git a/models/action.go b/models/action.go
index 4af81ce80a..a09e420660 100644
--- a/models/action.go
+++ b/models/action.go
@@ -142,6 +142,12 @@ func (a *Action) ShortActUserName() string {
return base.EllipsisString(a.GetActUserName(), 20)
}
+// GetActAvatar the action's user's avatar link
+func (a *Action) GetActAvatar() string {
+ a.loadActUser()
+ return a.ActUser.AvatarLink()
+}
+
// GetRepoUserName returns the name of the action repository owner.
func (a *Action) GetRepoUserName() string {
a.loadRepo()
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index fcc9b9cac5..12768bca52 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -1,7 +1,7 @@
{{range .Feeds}}
<div class="news">
<div class="ui left">
- <img class="ui avatar image" src="{{.ActAvatar}}" alt="">
+ <img class="ui avatar image" src="{{.GetActAvatar}}" alt="">
</div>
<div class="ui grid">
<div class="ui fifteen wide column">