Removed Mark visible button from org/members

routers/web/org/members.go

@@ -6,6 +6,7 @@ package org
 
 import (
 	"net/http"
+
 	"forgejo.org/models"
 	"forgejo.org/models/organization"
 	"forgejo.org/modules/base"
@@ -18,6 +19,7 @@ import (
 const (
 	// tplMembers template for organization members page
 	tplMembers base.TplName = "org/member/members"
+	tplSettingsOrganization base.TplName = "/user/settings/organization"
 )
 
 // Members render organization users page
@@ -79,7 +81,7 @@ func Members(ctx *context.Context) {
 func MembersAction(ctx *context.Context) {
 	uid := ctx.FormInt64("uid")
 	if uid == 0 {
-		ctx.Redirect("/user/settings/organization")
+		ctx.Redirect(tplSettingsOrganization)
 		return
 	}
 
@@ -106,7 +108,7 @@ func MembersAction(ctx *context.Context) {
 		err = models.RemoveOrgUser(ctx, org.ID, uid)
 		if organization.IsErrLastOrgOwner(err) {
 			ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
-			ctx.JSONRedirect("/user/settings/organization")
+			ctx.JSONRedirect(tplSettingsOrganization)
 			return
 		}
 	case "leave":
@@ -118,7 +120,7 @@ func MembersAction(ctx *context.Context) {
 			})
 		} else if organization.IsErrLastOrgOwner(err) {
 			ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
-			ctx.JSONRedirect("/user/settings/organization")
+			ctx.JSONRedirect(tplSettingsOrganization)
 		} else {
 			log.Error("RemoveOrgUser(%d,%d): %v", org.ID, ctx.Doer.ID, err)
 		}
@@ -134,7 +136,7 @@ func MembersAction(ctx *context.Context) {
 		return
 	}
 
-	redirect := "/user/settings/organization"
+	redirect := tplSettingsOrganization
 	if ctx.Params(":action") == "leave" {
 		redirect = setting.AppSubURL + "/"
 	}

routers/web/user/setting/profile.go

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

templates/org/member/members.tmpl

@@ -14,9 +14,6 @@
 					<div class="flex-item-main">
 						<div class="flex-item-title">
 							{{template "shared/user/name" .}}
-							{{if not $isPublic}}
-								<span class="ui label">{{ctx.Locale.Tr "org.members.private"}}</span>
-							{{end}}
 						</div>
 						{{if not $.PublicOnly}}
 							<div class="flex-item-body">
@@ -38,13 +35,6 @@
 						{{end}}
 					</div>
 					<div class="flex-item-trailing">
-						{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}
-							{{if $isPublic}}
-								<a class="ui tiny button link-action" href data-url="{{$.OrgLink}}/members/action/private?uid={{.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="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{svg "octicon-eye" 12 "icon"}}{{ctx.Locale.Tr "org.members.private_helper"}}</a>
-							{{end}}
-						{{end}}
 						{{if eq $.SignedUser.ID .ID}}
 							<form>
 								<button class="ui red tiny button delete-button" data-modal-id="leave-organization"