From 698b9e2acc4daafe7d2b314e2d8c96545dde9c40 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 26 Mar 2015 17:11:47 -0400 Subject: #1070 Clearer error message for illegal characters --- routers/org/org.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'routers/org/org.go') diff --git a/routers/org/org.go b/routers/org/org.go index ab589832..ed4f2abd 100644 --- a/routers/org/org.go +++ b/routers/org/org.go @@ -65,19 +65,22 @@ func CreatePost(ctx *middleware.Context, form auth.CreateOrgForm) { } var err error - if org, err = models.CreateOrganization(org, ctx.User); err != nil { - switch err { - case models.ErrUserAlreadyExist: + if err = models.CreateOrganization(org, ctx.User); err != nil { + switch { + case models.IsErrUserAlreadyExist(err): ctx.Data["Err_OrgName"] = true ctx.RenderWithErr(ctx.Tr("form.org_name_been_taken"), CREATE, &form) - case models.ErrEmailAlreadyUsed: + case models.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), CREATE, &form) - case models.ErrUserNameIllegal: + case models.IsErrNameReserved(err): ctx.Data["Err_OrgName"] = true - ctx.RenderWithErr(ctx.Tr("form.illegal_org_name"), CREATE, &form) + 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, "CreateUser", err) + ctx.Handle(500, "CreateOrganization", err) } return } -- cgit v1.2.3