Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix invalid reference in feeds template #1820

Merged
merged 3 commits into from
May 27, 2017

Conversation

ethantkoenig
Copy link
Member

@ethantkoenig ethantkoenig commented May 26, 2017

Fixes the following error on the dashboard page: (oversight on my part from #1779)

template: user/dashboard/feeds:4:39: executing "user/dashboard/feeds" at <.ActAvatar>: can't evaluate field ActAvatar in type *models.Action

see #1812 (comment)

models/action.go Outdated
@@ -142,6 +142,11 @@ func (a *Action) ShortActUserName() string {
return base.EllipsisString(a.GetActUserName(), 20)
}

func (a *Action) GetActAvatar() string {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing comment on this function

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, updated

@lunny
Copy link
Member

lunny commented May 26, 2017

maybe add an integration test for the dashboard so that any template render error could be catched next time. @ethantkoenig

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 26, 2017
@lunny lunny added this to the 1.2.0 milestone May 26, 2017
@lunny lunny added the type/bug label May 26, 2017
@lunny
Copy link
Member

lunny commented May 26, 2017

Otherwise LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 26, 2017
@appleboy
Copy link
Member

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 27, 2017
@ethantkoenig
Copy link
Member Author

@lunny Added an integration test

@ethantkoenig
Copy link
Member Author

ethantkoenig commented May 27, 2017

Rebased to get update to .drone.yml.sig

Immediately after rebasing, I realized that it wasn't necessary, since a bad signature won't break a PR build. Sorry for any inconvenience.

@lunny
Copy link
Member

lunny commented May 27, 2017

@ethantkoenig don't worry, I will merge this after CI completed.

@lunny lunny merged commit bafd778 into go-gitea:master May 27, 2017
@camlafit
Copy link
Contributor

Hi

Thanks I tested now and no problem on dashboard display

@ethantkoenig ethantkoenig deleted the fix_template branch May 29, 2017 14:33
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants