Fix invalid reference in feeds template (#1820)

* Fix invalid reference in feeds template

* Comment for GetActAvatar

* Add integration test
tokarchuk/v1.17
Ethan Koenig 8 years ago committed by Lunny Xiao
parent 97f7f88bed
commit bafd778c25
  1. 9
      integrations/issue_test.go
  2. 6
      models/action.go
  3. 2
      templates/user/dashboard/feeds.tmpl

@ -11,6 +11,15 @@ import (
"github.com/stretchr/testify/assert" "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) { func TestNoLoginViewIssue(t *testing.T) {
prepareTestEnv(t) prepareTestEnv(t)

@ -142,6 +142,12 @@ func (a *Action) ShortActUserName() string {
return base.EllipsisString(a.GetActUserName(), 20) 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. // GetRepoUserName returns the name of the action repository owner.
func (a *Action) GetRepoUserName() string { func (a *Action) GetRepoUserName() string {
a.loadRepo() a.loadRepo()

@ -1,7 +1,7 @@
{{range .Feeds}} {{range .Feeds}}
<div class="news"> <div class="news">
<div class="ui left"> <div class="ui left">
<img class="ui avatar image" src="{{.ActAvatar}}" alt=""> <img class="ui avatar image" src="{{.GetActAvatar}}" alt="">
</div> </div>
<div class="ui grid"> <div class="ui grid">
<div class="ui fifteen wide column"> <div class="ui fifteen wide column">

Loading…
Cancel
Save