@@ -63,17 +63,6 @@ func userProfile(ctx *context.Context) {
6363ctx .Data ["Title" ]= ctx .ContextUser .DisplayName ()
6464ctx .Data ["PageIsUserProfile" ]= true
6565
66- // prepare heatmap data
67- if setting .Service .EnableUserHeatmap {
68- data ,err := activities_model .GetUserHeatmapDataByUser (ctx ,ctx .ContextUser ,ctx .Doer )
69- if err != nil {
70- ctx .ServerError ("GetUserHeatmapDataByUser" ,err )
71- return
72- }
73- ctx .Data ["HeatmapData" ]= data
74- ctx .Data ["HeatmapTotalContributions" ]= activities_model .GetTotalContributionsInHeatmap (data )
75- }
76-
7766profileDbRepo ,profileReadmeBlob := shared_user .FindOwnerProfileReadme (ctx ,ctx .Doer )
7867
7968prepareUserProfileTabData (ctx ,profileDbRepo ,profileReadmeBlob )
@@ -172,6 +161,17 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R
172161ctx .Data ["Cards" ]= following
173162total = int (numFollowing )
174163case "activity" :
164+ // prepare heatmap data
165+ if setting .Service .EnableUserHeatmap {
166+ data ,err := activities_model .GetUserHeatmapDataByUser (ctx ,ctx .ContextUser ,ctx .Doer )
167+ if err != nil {
168+ ctx .ServerError ("GetUserHeatmapDataByUser" ,err )
169+ return
170+ }
171+ ctx .Data ["HeatmapData" ]= data
172+ ctx .Data ["HeatmapTotalContributions" ]= activities_model .GetTotalContributionsInHeatmap (data )
173+ }
174+
175175date := ctx .FormString ("date" )
176176pagingNum = setting .UI .FeedPagingNum
177177showPrivate := ctx .IsSigned && (ctx .Doer .IsAdmin || ctx .Doer .ID == ctx .ContextUser .ID )