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.

Sign up for GitHub

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

Jump to bottom

UserProfile Page: Render Description #12415

Merged
merged 10 commits into from
Aug 5, 2020
Merged

UserProfile Page: Render Description #12415

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
59557e6
If Description contain more that one line render it
6543 Aug 3, 2020
af9709d
simpler ...
6543 Aug 3, 2020
59bed3c
only render if description exists
6543 Aug 4, 2020
a129ebc
Merge branch 'master' into render-user-Biography
6543 Aug 4, 2020
ec51748
Merge branch 'master' into render-user-Biography
zeripath Aug 4, 2020
eb98beb
Merge branch 'master' into render-user-Biography
6543 Aug 4, 2020
2c101c6
Fix NPE in tests
zeripath Aug 4, 2020
be19832
Merge branch 'master' into render-user-Biography
6543 Aug 4, 2020
6abc1f9
Merge branch 'master' into render-user-Biography
6543 Aug 5, 2020
fa7bff9
Update routers/user/profile.go
6543 Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions routers/user/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/routers/org"
Expand Down Expand Up @@ -97,6 +98,10 @@ func Profile(ctx *context.Context) {
// so everyone would get the same empty heatmap
ctx.Data["EnableHeatmap"] = setting.Service.EnableUserHeatmap && !ctxUser.KeepActivityPrivate
ctx.Data["HeatmapUser"] = ctxUser.Name
if ctx.User != nil && len(ctx.User.Description) != 0 {
6543 marked this conversation as resolved.
Show resolved Hide resolved
lunny marked this conversation as resolved.
Show resolved Hide resolved
ctx.Data["RenderedDescription"] = string(markdown.Render([]byte(ctxUser.Description), ctx.Repo.RepoLink, map[string]string{"mode": "document"}))
}

showPrivate := ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID)

orgs, err := models.GetOrgsByUserID(ctxUser.ID, showPrivate)
Expand Down
5 changes: 2 additions & 3 deletions templates/user/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@
<a target="_blank" rel="noopener noreferrer me" href="{{.Owner.Website}}">{{.Owner.Website}}</a>
</li>
{{end}}
{{if .Owner.Description}}
{{if $.RenderedDescription}}
<li>
{{svg "octicon-info" 16}}
<span>{{.Owner.Description}}</span>
<div class="render-content markdown">{{$.RenderedDescription|Str2html}}</div>
</li>
{{end}}
{{range .OpenIDs}}
Expand Down