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:
		
							parent
							
								
									6ab4d76ced
								
							
						
					
					
						commit
						2872a04f27
					
				
					 2 changed files with 7 additions and 3 deletions
				
			
		|  | @ -12,6 +12,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
| 	"code.gitea.io/gitea/modules/context" | 	"code.gitea.io/gitea/modules/context" | ||||||
|  | 	"code.gitea.io/gitea/modules/markup/markdown" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 	"code.gitea.io/gitea/modules/util" | 	"code.gitea.io/gitea/modules/util" | ||||||
| 	"code.gitea.io/gitea/routers/org" | 	"code.gitea.io/gitea/routers/org" | ||||||
|  | @ -97,6 +98,10 @@ func Profile(ctx *context.Context) { | ||||||
| 	// so everyone would get the same empty heatmap
 | 	// so everyone would get the same empty heatmap
 | ||||||
| 	ctx.Data["EnableHeatmap"] = setting.Service.EnableUserHeatmap && !ctxUser.KeepActivityPrivate | 	ctx.Data["EnableHeatmap"] = setting.Service.EnableUserHeatmap && !ctxUser.KeepActivityPrivate | ||||||
| 	ctx.Data["HeatmapUser"] = ctxUser.Name | 	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) | 	showPrivate := ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID) | ||||||
| 
 | 
 | ||||||
| 	orgs, err := models.GetOrgsByUserID(ctxUser.ID, showPrivate) | 	orgs, err := models.GetOrgsByUserID(ctxUser.ID, showPrivate) | ||||||
|  |  | ||||||
|  | @ -34,10 +34,9 @@ | ||||||
| 									<a target="_blank" rel="noopener noreferrer me" href="{{.Owner.Website}}">{{.Owner.Website}}</a> | 									<a target="_blank" rel="noopener noreferrer me" href="{{.Owner.Website}}">{{.Owner.Website}}</a> | ||||||
| 								</li> | 								</li> | ||||||
| 							{{end}} | 							{{end}} | ||||||
| 							{{if .Owner.Description}} | 							{{if $.RenderedDescription}} | ||||||
| 								<li> | 								<li> | ||||||
| 									{{svg "octicon-info" 16}} | 									<div class="render-content markdown">{{$.RenderedDescription|Str2html}}</div> | ||||||
| 									<span>{{.Owner.Description}}</span> |  | ||||||
| 								</li> | 								</li> | ||||||
| 							{{end}} | 							{{end}} | ||||||
| 							{{range .OpenIDs}} | 							{{range .OpenIDs}} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue