Allow Organisations to have a E-Mail

Author: JakobDev

modules/structs/org.go

@@ -8,6 +8,7 @@ type Organization struct {
 	ID                        int64  `json:"id"`
 	Name                      string `json:"name"`
 	FullName                  string `json:"full_name"`
+	EMail                     string `json:"email"`
 	AvatarURL                 string `json:"avatar_url"`
 	Description               string `json:"description"`
 	Website                   string `json:"website"`

options/locale/locale_en-US.ini

@@ -2511,6 +2511,7 @@ form.create_org_not_allowed = You are not allowed to create an organization.
 settings = Settings
 settings.options = Organization
 settings.full_name = Full Name
+settings.email = Contact E-Mail
 settings.website = Website
 settings.location = Location
 settings.permission = Permissions

routers/api/v1/org/org.go

@@ -299,7 +299,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

routers/web/org/setting.go

@@ -101,6 +101,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

services/convert/convert.go

@@ -289,6 +289,7 @@ func ToOrganization(ctx context.Context, org *organization.Organization) *api.Or
 		Name:                      org.Name,
 		UserName:                  org.Name,
 		FullName:                  org.FullName,
+		EMail:                     org.Email,
 		Description:               org.Description,
 		Website:                   org.Website,
 		Location:                  org.Location,

services/forms/org.go

@@ -38,6 +38,7 @@ func (f *CreateOrgForm) Validate(req *http.Request, errs binding.Errors) binding
 type UpdateOrgSettingForm struct {
 	Name                      string `binding:"Required;Username;MaxSize(40)" locale:"org.org_name_holder"`
 	FullName                  string `binding:"MaxSize(100)"`
+	Email                     string `binding:"MaxSize(255)"`
 	Description               string `binding:"MaxSize(255)"`
 	Website                   string `binding:"ValidUrl;MaxSize(255)"`
 	Location                  string `binding:"MaxSize(50)"`

templates/org/home.tmpl

@@ -17,6 +17,9 @@
 			<div class="text grey meta">
 				{{if .Org.Location}}<div class="item">{{svg "octicon-location"}} <span>{{.Org.Location}}</span></div>{{end}}
 				{{if .Org.Website}}<div class="item">{{svg "octicon-link"}} <a target="_blank" rel="noopener noreferrer me" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}}
+				{{if $.IsSigned}}
+					{{if .Org.Email}}<div class="item">{{svg "octicon-mail"}} <a href="mailto:{{.Org.Email}}">{{.Org.Email}}</a></div>{{end}}
+				{{end}}
 			</div>
 		</div>
 		<div class="right stackable menu">

templates/org/settings/options.tmpl

@@ -18,6 +18,10 @@
 							<label for="full_name">{{.locale.Tr "org.org_full_name_holder"}}</label>
 							<input id="full_name" name="full_name" value="{{.Org.FullName}}" maxlength="100">
 						</div>
+						<div class="field {{if .Err_Email}}error{{end}}">
+							<label for="email">{{.locale.Tr "org.settings.email"}}</label>
+							<input id="email" name="email" type="email" value="{{.Org.Email}}" maxlength="255">
+						</div>
 						<div class="field {{if .Err_Description}}error{{end}}">
 							<label for="description">{{$.locale.Tr "org.org_desc"}}</label>
 							<textarea id="description" name="description" rows="2" maxlength="255">{{.Org.Description}}</textarea>