Skip to content

Commit

Permalink
Introduce fixes and more rigorous tests for 'Show on a map' feature (g…
Browse files Browse the repository at this point in the history
…o-gitea#26803) (go-gitea#27365)

Backport go-gitea#26803 by @n0toose

This change introduces some fixes for my original PR
(go-gitea#26214) and introduces some
additional tests so that such a regression does not happen again in the
future.

Co-authored-by: Panagiotis "Ivory" Vasilopoulos <git@n0toose.net>
  • Loading branch information
GiteaBot and n0toose committed Sep 30, 2023
1 parent 79c17d8 commit de38710
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions routers/web/shared/user/header.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) {

ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx, ctx.Doer.ID, ctx.ContextUser.ID)
ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate
ctx.Data["UserLocationMapURL"] = setting.Service.UserLocationMapURL

// Show OpenID URIs
openIDs, err := user_model.GetUserOpenIDs(ctx, ctx.ContextUser.ID)
Expand Down
1 change: 0 additions & 1 deletion routers/web/user/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func userProfile(ctx *context.Context) {

ctx.Data["Title"] = ctx.ContextUser.DisplayName()
ctx.Data["PageIsUserProfile"] = true
ctx.Data["UserLocationMapURL"] = setting.Service.UserLocationMapURL

// prepare heatmap data
if setting.Service.EnableUserHeatmap {
Expand Down

0 comments on commit de38710

Please sign in to comment.