#3169

repo-square:change setting name

modules/setting/setting.go

@@ -667,8 +667,8 @@ var (
 	CloudbrainStoppedRemark     string
 
 	//repo square config
-	IncubationSourceOrgId int64
-	PaperRepoTopicName    string
+	IncubationSourceOrgName string
+	PaperRepoTopicName      string
 
 	//nginx proxy
 	PROXYURL string
@@ -1579,7 +1579,7 @@ func NewContext() {
 	CloudbrainStoppedRemark = sec.Key("CLOUDBRAIN_STOPPED_REMARK").MustString("感谢您的耐心等待。")
 
 	sec = Cfg.Section("repo-square")
-	IncubationSourceOrgId = sec.Key("INCUBATION_ORG_ID").MustInt64(9)
+	IncubationSourceOrgName = sec.Key("INCUBATION_ORG_NAME").MustString("OpenI")
 	PaperRepoTopicName = sec.Key("PAPER_REPO_TOPIC_NAME").MustString("openi-paper")
 
 	sec = Cfg.Section("point")

services/repository/square.go

@@ -115,12 +115,19 @@ func GetPreferredRepos() ([]*models.Repository4Card, error) {
 }
 
 func GetIncubationRepos() ([]*models.Repository4Card, error) {
+	org, err := models.GetOrgByName(setting.IncubationSourceOrgName)
+	if models.IsErrOrgNotExist(err) {
+		return make([]*models.Repository4Card, 0), nil
+	}
+	if err != nil {
+		return nil, err
+	}
 	repos, err := models.GetSelectedRepos(models.FindSelectedReposOpts{
 		ListOptions: models.ListOptions{
 			PageSize: 10,
 			Page:     1,
 		},
-		OrgId:      setting.IncubationSourceOrgId,
+		OrgId:      org.ID,
 		OnlyPublic: true,
 	})
 	if err != nil {