WIP

routers/web/org/members.go

@@ -6,7 +6,6 @@ package org
 
 import (
 	"net/http"
-
 	"forgejo.org/models"
 	"forgejo.org/models/organization"
 	"forgejo.org/modules/base"
@@ -135,6 +134,7 @@ func MembersAction(ctx *context.Context) {
 		return
 	}
 
+	log.Info("redirecting to", ctx.Org.OrgLink)
 	redirect := ctx.Org.OrgLink + "/members"
 	if ctx.Params(":action") == "leave" {
 		redirect = setting.AppSubURL + "/"

routers/web/user/setting/profile.go

@@ -215,7 +215,20 @@ func Organization(ctx *context.Context) {
 		return
 	}
 
+	// Get public membership status for each organization
+    orgsIsPublicMember := make(map[int64]bool)
+    for _, org := range orgs {
+        isPublic, err := organization.IsPublicMembership(ctx, org.ID, ctx.Doer.ID)
+        if err != nil {
+            ctx.ServerError("IsPublicMembership", err)
+            return
+        }
+        orgsIsPublicMember[org.ID] = isPublic
+    }
+
 	ctx.Data["Orgs"] = orgs
+	ctx.Data["Total"] = total
+    ctx.Data["OrgsIsPublicMember"] = orgsIsPublicMember
 	pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5)
 	pager.SetDefaultParams(ctx)
 	ctx.Data["Page"] = pager

templates/user/settings/organization.tmpl

@@ -23,6 +23,12 @@
 							</div>
 						</div>
 						<div class="flex-item-trailing">
+							{{$isPublic := index $.OrgsIsPublicMember .ID}}
+							{{if $isPublic}}
+								<a class="ui tiny button link-action" href data-url="{{.OrganisationLink}}/members/action/private?uid={{$.SignedUser.ID}}">{{svg "octicon-eye-closed" 12 "icon"}}{{ctx.Locale.Tr "org.members.public_helper"}}</a>
+							{{else}}
+								<a class="ui tiny button link-action" href data-url="{{.OrganisationLink}}/members/action/public?uid={{$.SignedUser.ID}}">{{svg "octicon-eye" 12 "icon"}}{{ctx.Locale.Tr "org.members.private_helper"}}</a>
+							{{end}}
 							<form>
 								{{$.CsrfTokenHtml}}
 								<button class="ui red button delete-button" data-modal-id="leave-organization"