|
@@ -6,9 +6,7 @@ |
|
|
package user |
|
|
package user |
|
|
|
|
|
|
|
|
import ( |
|
|
import ( |
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
|
|
"code.gitea.io/gitea/services/badge" |
|
|
"code.gitea.io/gitea/services/badge" |
|
|
"encoding/json" |
|
|
|
|
|
"errors" |
|
|
"errors" |
|
|
"fmt" |
|
|
"fmt" |
|
|
"path" |
|
|
"path" |
|
@@ -105,8 +103,6 @@ func Profile(ctx *context.Context) { |
|
|
ctx.Data["Owner"] = ctxUser |
|
|
ctx.Data["Owner"] = ctxUser |
|
|
ctx.Data["OpenIDs"] = openIDs |
|
|
ctx.Data["OpenIDs"] = openIDs |
|
|
ctx.Data["RecentBadges"] = badges |
|
|
ctx.Data["RecentBadges"] = badges |
|
|
b, _ := json.Marshal(badges) |
|
|
|
|
|
log.Info(string(b)) |
|
|
|
|
|
ctx.Data["EnableHeatmap"] = setting.Service.EnableUserHeatmap |
|
|
ctx.Data["EnableHeatmap"] = setting.Service.EnableUserHeatmap |
|
|
ctx.Data["HeatmapUser"] = ctxUser.Name |
|
|
ctx.Data["HeatmapUser"] = ctxUser.Name |
|
|
showPrivate := ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID) |
|
|
showPrivate := ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID) |
|
@@ -316,8 +312,6 @@ func Profile(ctx *context.Context) { |
|
|
ctx.ServerError("GetUserAllBadges", err) |
|
|
ctx.ServerError("GetUserAllBadges", err) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
ab, _ := json.Marshal(allBadges) |
|
|
|
|
|
log.Info(string(ab)) |
|
|
|
|
|
ctx.Data["AllBadges"] = allBadges |
|
|
ctx.Data["AllBadges"] = allBadges |
|
|
default: |
|
|
default: |
|
|
ctx.ServerError("tab error", errors.New("tab error")) |
|
|
ctx.ServerError("tab error", errors.New("tab error")) |
|
|