From: Giteabot <teabot@gitea.io>
Date: Sun, 24 Mar 2024 05:38:31 +0000 (+0800)
Subject: Respect DEFAULT_ORG_MEMBER_VISIBLE setting when adding creator to org (#30013) (... 
X-Git-Tag: v1.21.10~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e321b8a849087d736a96275d5960f9b1446c95ba;p=gitea.git

Respect DEFAULT_ORG_MEMBER_VISIBLE setting when adding creator to org (#30013) (#30035)

Backport #30013 by @DrMaxNix

This PR adds `setting.Service.DefaultOrgMemberVisible` value to dataset
of user when the initial org creator is being added to the created org.

Fixes #30012.

Co-authored-by: DrMaxNix <mail@drmaxnix.de>
---

diff --git a/models/organization/org.go b/models/organization/org.go
index 260571b4b2..dad6c7f37d 100644
--- a/models/organization/org.go
+++ b/models/organization/org.go
@@ -319,8 +319,9 @@ func CreateOrganization(org *Organization, owner *user_model.User) (err error) {
 
 	// Add initial creator to organization and owner team.
 	if err = db.Insert(ctx, &OrgUser{
-		UID:   owner.ID,
-		OrgID: org.ID,
+		UID:      owner.ID,
+		OrgID:    org.ID,
+		IsPublic: setting.Service.DefaultOrgMemberVisible,
 	}); err != nil {
 		return fmt.Errorf("insert org-user relation: %w", err)
 	}