From 311c83ad17c718f1b81c94f84307b4288c90e374 Mon Sep 17 00:00:00 2001 From: Sasha Varlamov Date: Thu, 7 Dec 2017 14:00:09 +0700 Subject: Allow adding collaborators with (fullname) (#3103) * Allow adding collaborators with (fullname) Signed-off-by: Sasha Varlamov * Refactor username suffix to utils pkg Signed-off-by: Sasha Varlamov --- routers/org/teams.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'routers/org') diff --git a/routers/org/teams.go b/routers/org/teams.go index e9abfe7917..7f8b828e82 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/routers/utils" ) const ( @@ -76,11 +77,7 @@ func TeamsAction(ctx *context.Context) { ctx.Error(404) return } - uname := ctx.Query("uname") - // uname may be formatted as "username (fullname)" - if strings.Contains(uname, "(") && strings.HasSuffix(uname, ")") { - uname = strings.TrimSpace(strings.Split(uname, "(")[0]) - } + uname := utils.RemoveUsernameParameterSuffix(strings.ToLower(ctx.Query("uname"))) var u *models.User u, err = models.GetUserByName(uname) if err != nil { -- cgit v1.2.3