diff options
Diffstat (limited to 'models/topic.go')
| -rw-r--r-- | models/topic.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/models/topic.go b/models/topic.go index 1969c57db8..31e81c8d0f 100644 --- a/models/topic.go +++ b/models/topic.go @@ -60,7 +60,7 @@ func ValidateTopic(topic string) bool { } // SanitizeAndValidateTopics sanitizes and checks an array or topics -func SanitizeAndValidateTopics(topics []string) (validTopics []string, invalidTopics []string) { +func SanitizeAndValidateTopics(topics []string) (validTopics, invalidTopics []string) { validTopics = make([]string, 0) mValidTopics := make(map[string]struct{}) invalidTopics = make([]string, 0) @@ -171,7 +171,7 @@ type FindTopicOptions struct { } func (opts *FindTopicOptions) toConds() builder.Cond { - var cond = builder.NewCond() + cond := builder.NewCond() if opts.RepoID > 0 { cond = cond.And(builder.Eq{"repo_topic.repo_id": opts.RepoID}) } @@ -199,8 +199,9 @@ func FindTopics(opts *FindTopicOptions) (topics []*Topic, err error) { func GetRepoTopicByName(repoID int64, topicName string) (*Topic, error) { return getRepoTopicByName(x, repoID, topicName) } + func getRepoTopicByName(e Engine, repoID int64, topicName string) (*Topic, error) { - var cond = builder.NewCond() + cond := builder.NewCond() var topic Topic cond = cond.And(builder.Eq{"repo_topic.repo_id": repoID}).And(builder.Eq{"topic.name": topicName}) sess := e.Table("topic").Where(cond) |