diff options
| author | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
|---|---|---|
| committer | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
| commit | 964d0262ff353db6a50ed5be83ebd22f71aa6e69 (patch) | |
| tree | 8cbab6b6a9b4f62cbe9acb2a0b8752b531633362 /routers/org/org.go | |
| parent | 079a2d68db5c843ef2dbba65aeca46d5887d6b02 (diff) | |
| parent | b75d0378cbbf0523963fd9bc749543244be7392b (diff) | |
Merged conflicts.
Diffstat (limited to 'routers/org/org.go')
| -rw-r--r-- | routers/org/org.go | 11 |
1 files changed, 2 insertions, 9 deletions
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) |