MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 15:04:09 +01:00
Code Issues Releases Wiki Activity

Fix broken following organization (#29005)

Browse source 
- following organization is broken from #28908
- add login check for the follow button in organization profile page
This commit is contained in:
yp05327 2024-02-17 14:13:37 +09:00 committed by GitHub
parent e936d2b338
commit 68227996a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
routers/web/user/profile.go
View file

@ -29,6 +29,7 @@ import (
const ( const (
tplProfileBigAvatar base.TplName = "shared/user/profile_big_avatar" tplProfileBigAvatar base.TplName = "shared/user/profile_big_avatar"
tplFollowUnfollow base.TplName = "shared/user/follow_unfollow"
) )
// OwnerProfile render profile page for a user or a organization (aka, repo owner) // OwnerProfile render profile page for a user or a organization (aka, repo owner)
@ -318,6 +319,15 @@ func Action(ctx *context.Context) {
return return
} }
shared_user.PrepareContextForProfileBigAvatar(ctx) if ctx.ContextUser.IsIndividual() {
ctx.HTML(http.StatusOK, tplProfileBigAvatar) shared_user.PrepareContextForProfileBigAvatar(ctx)
ctx.HTML(http.StatusOK, tplProfileBigAvatar)
return
} else if ctx.ContextUser.IsOrganization() {
ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx, ctx.Doer.ID, ctx.ContextUser.ID)
ctx.HTML(http.StatusOK, tplFollowUnfollow)
return
}
log.Error("Failed to apply action %q: unsupport context user type: %s", ctx.FormString("action"), ctx.ContextUser.Type)
ctx.Error(http.StatusBadRequest, fmt.Sprintf("Action %q failed", ctx.FormString("action")))
} }

16
templates/org/home.tmpl
View file

@ -25,13 +25,15 @@
{{svg "octicon-rss" 24}} {{svg "octicon-rss" 24}}
</a> </a>
{{end}} {{end}}
<button class="link-action ui basic button gt-mr-0" data-url="{{.Org.HomeLink}}?action={{if $.IsFollowing}}unfollow{{else}}follow{{end}}"> {{if .IsSigned}}
{{if $.IsFollowing}} <button class="ui basic button gt-mr-0" hx-post="{{.Org.HomeLink}}?action={{if $.IsFollowing}}unfollow{{else}}follow{{end}}">
{{ctx.Locale.Tr "user.unfollow"}} {{if $.IsFollowing}}
{{else}} {{ctx.Locale.Tr "user.unfollow"}}
{{ctx.Locale.Tr "user.follow"}} {{else}}
{{end}} {{ctx.Locale.Tr "user.follow"}}
</button> {{end}}
</button>
{{end}}
</div> </div>
</div> </div>