From 80701d45bbe333f1bdef4673fae43df131b2222f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 6 Sep 2015 10:08:14 -0400 Subject: #1193 Make organization emails non-mandatory --- routers/org/org.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'routers/org/org.go') diff --git a/routers/org/org.go b/routers/org/org.go index ed4f2abd..d1c1940c 100644 --- a/routers/org/org.go +++ b/routers/org/org.go @@ -59,25 +59,18 @@ func CreatePost(ctx *middleware.Context, form auth.CreateOrgForm) { org := &models.User{ Name: form.OrgName, - Email: form.Email, IsActive: true, Type: models.ORGANIZATION, } - var err error - if err = models.CreateOrganization(org, ctx.User); err != nil { + if err := models.CreateOrganization(org, ctx.User); err != nil { + ctx.Data["Err_OrgName"] = true switch { case models.IsErrUserAlreadyExist(err): - ctx.Data["Err_OrgName"] = true ctx.RenderWithErr(ctx.Tr("form.org_name_been_taken"), CREATE, &form) - case models.IsErrEmailAlreadyUsed(err): - ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_been_used"), CREATE, &form) case models.IsErrNameReserved(err): - ctx.Data["Err_OrgName"] = true ctx.RenderWithErr(ctx.Tr("org.form.name_reserved", err.(models.ErrNameReserved).Name), CREATE, &form) case models.IsErrNamePatternNotAllowed(err): - ctx.Data["Err_OrgName"] = true ctx.RenderWithErr(ctx.Tr("org.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), CREATE, &form) default: ctx.Handle(500, "CreateOrganization", err) -- cgit v1.2.3