summaryrefslogtreecommitdiffstats
path: root/routers/user/profile.go
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2020-11-18 23:00:16 +0100
committerGitHub <noreply@github.com>2020-11-18 16:00:16 -0600
commit12c2efb45c112baf6013c304c35cbd404f7be21a (patch)
tree2deb1fd0a4c09b048c9e4f262057bfe4cfa774b1 /routers/user/profile.go
parentd02c3508e629d854d0094f4562c4cdebfada5962 (diff)
downloadgitea-12c2efb45c112baf6013c304c35cbd404f7be21a.tar.gz
gitea-12c2efb45c112baf6013c304c35cbd404f7be21a.zip
Remove fetch request from heatmap (#13623)
* Remove fetch request from heatmap Render heatmap data directly to HTML, eliminating one HTTP request on frontpage and user profile. Also added min-height to the container so the page content will no longer move after loading. * rename and error display * also log the js error * add error handler * remove useless inline style and hide divider on small screens * Update routers/user/home.go * Update routers/user/profile.go
Diffstat (limited to 'routers/user/profile.go')
-rw-r--r--routers/user/profile.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/routers/user/profile.go b/routers/user/profile.go
index 8bf5cacc56..36f3d0735d 100644
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -94,10 +94,18 @@ func Profile(ctx *context.Context) {
ctx.Data["PageIsUserProfile"] = true
ctx.Data["Owner"] = ctxUser
ctx.Data["OpenIDs"] = openIDs
+
// no heatmap access for admins; GetUserHeatmapDataByUser ignores the calling user
// so everyone would get the same empty heatmap
- ctx.Data["EnableHeatmap"] = setting.Service.EnableUserHeatmap && !ctxUser.KeepActivityPrivate
- ctx.Data["HeatmapUser"] = ctxUser.Name
+ if setting.Service.EnableUserHeatmap && !ctxUser.KeepActivityPrivate {
+ data, err := models.GetUserHeatmapDataByUser(ctxUser)
+ if err != nil {
+ ctx.ServerError("GetUserHeatmapDataByUser", err)
+ return
+ }
+ ctx.Data["HeatmapData"] = data
+ }
+
if len(ctxUser.Description) != 0 {
ctx.Data["RenderedDescription"] = string(markdown.Render([]byte(ctxUser.Description), ctx.Repo.RepoLink, map[string]string{"mode": "document"}))
}