From f4aedda13a4e243d9c3deb941bea28b79a893975 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 14 Feb 2017 03:16:02 -0500 Subject: org/team: make 'new' as reserved for team name (#3789) --- models/org_team.go | 13 +++++++++++++ models/repo.go | 1 + 2 files changed, 14 insertions(+) (limited to 'models') diff --git a/models/org_team.go b/models/org_team.go index 20fa7e23..c9f6f5d1 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -206,11 +206,24 @@ func (t *Team) RemoveRepository(repoID int64) error { return sess.Commit() } +var reservedTeamNames = []string{"new"} + +// IsUsableTeamName return an error if given name is a reserved name or pattern. +func IsUsableTeamName(name string) error { + return isUsableName(reservedTeamNames, nil, name) +} + // NewTeam creates a record of new team. // It's caller's responsibility to assign organization ID. func NewTeam(t *Team) error { if len(t.Name) == 0 { return errors.New("empty team name") + } else if t.OrgID == 0 { + return errors.New("OrgID is not assigned") + } + + if err := IsUsableTeamName(t.Name); err != nil { + return err } has, err := x.Id(t.OrgID).Get(new(User)) diff --git a/models/repo.go b/models/repo.go index 70423929..9278499b 100644 --- a/models/repo.go +++ b/models/repo.go @@ -906,6 +906,7 @@ var ( reservedRepoPatterns = []string{"*.git", "*.wiki"} ) +// IsUsableRepoName return an error if given name is a reserved name or pattern. func IsUsableRepoName(name string) error { return isUsableName(reservedRepoNames, reservedRepoPatterns, name) } -- cgit v1.2.3