From 78a31784726718f393151155fb7a578115d035e9 Mon Sep 17 00:00:00 2001 From: Alexey Terentyev Date: Sun, 24 Jun 2018 23:25:45 +0300 Subject: [PATCH] Added general sorting criteria Signed-off-by: Alexey Terentyev --- models/migrations/v68.go | 4 ++-- models/topic.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/migrations/v68.go b/models/migrations/v68.go index c03815a0f..b087144ff 100644 --- a/models/migrations/v68.go +++ b/models/migrations/v68.go @@ -190,8 +190,8 @@ func reformatAndRemoveIncorrectTopics(x *xorm.Engine) (err error) { log.Info("Updating repositories 'topics' fields...") for repoID := range touchedRepo { if err := sess.Table("topic").Cols("name"). - Join("INNER", "repo_topic", "topic.id = repo_topic.topic_id"). - Where("repo_topic.repo_id = ?", repoID).Find(&topicNames); err != nil { + Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id"). + Where("repo_topic.repo_id = ?", repoID).Desc("topic.repo_count").Find(&topicNames); err != nil { return err } log.Info("Updating 'topics' field for repository with id = %v", repoID) diff --git a/models/topic.go b/models/topic.go index 247aac5ff..276d4d17c 100644 --- a/models/topic.go +++ b/models/topic.go @@ -192,8 +192,8 @@ func SaveTopics(repoID int64, topicNames ...string) error { topicNames = topicNames[:0] if err := sess.Table("topic").Cols("name"). - Join("INNER", "repo_topic", "topic.id = repo_topic.topic_id"). - Where("repo_topic.repo_id = ?", repoID).Find(&topicNames); err != nil { + Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id"). + Where("repo_topic.repo_id = ?", repoID).Desc("topic.repo_count").Find(&topicNames); err != nil { return err }