mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-03 21:08:25 +00:00 
			
		
		
		
	UserProfile Page: Render Description (#12415)
* If Description contain more that one line render it * simpler ... * only render if description exists * Fix NPE in tests * Update routers/user/profile.go Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
		@@ -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"
 | 
			
		||||
@@ -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 len(ctxUser.Description) != 0 {
 | 
			
		||||
		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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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}}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user