From 6598d0291cf7dfeb00cb5e5d18faf2bf46fad596 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 25 Jul 2023 10:26:27 +0200 Subject: Allow Organisations to have a E-Mail (#25082) Resolves #25057 This adds a E-Mail field to Organisations. The E-Mail is just shown on the Profile when it is visited by a logged in User. The E-mail is not used for something else. **Screenshots:** ![grafik](https://github.com/go-gitea/gitea/assets/15185051/a8d622b3-7278-4c08-984b-9c5ebfdb5471) ![grafik](https://github.com/go-gitea/gitea/assets/15185051/6dcb1dd7-d04b-49eb-bc96-6582cfe9757b) --------- Co-authored-by: Denys Konovalov Co-authored-by: Denys Konovalov Co-authored-by: wxiaoguang Co-authored-by: Giteabot --- routers/api/v1/org/org.go | 12 +++++++++++- routers/web/org/setting.go | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'routers') diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 4e30ad1762..b0666c87f8 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -255,6 +255,7 @@ func Create(ctx *context.APIContext) { org := &organization.Organization{ Name: form.UserName, FullName: form.FullName, + Email: form.Email, Description: form.Description, Website: form.Website, Location: form.Location, @@ -299,7 +300,15 @@ func Get(ctx *context.APIContext) { ctx.NotFound("HasOrgOrUserVisible", nil) return } - ctx.JSON(http.StatusOK, convert.ToOrganization(ctx, ctx.Org.Organization)) + + org := convert.ToOrganization(ctx, ctx.Org.Organization) + + // Don't show Mail, when User is not logged in + if ctx.Doer == nil { + org.Email = "" + } + + ctx.JSON(http.StatusOK, org) } // Edit change an organization's information @@ -328,6 +337,7 @@ func Edit(ctx *context.APIContext) { form := web.GetForm(ctx).(*api.EditOrgOption) org := ctx.Org.Organization org.FullName = form.FullName + org.Email = form.Email org.Description = form.Description org.Website = form.Website org.Location = form.Location diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index bd558f78b8..f63b2e9f06 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -100,6 +100,7 @@ func SettingsPost(ctx *context.Context) { } org.FullName = form.FullName + org.Email = form.Email org.Description = form.Description org.Website = form.Website org.Location = form.Location -- cgit v1.2.3