fix-3137

routers/admin/cloudbrains.go

@@ -70,7 +70,7 @@ func CloudBrains(ctx *context.Context) {
 
 	keyword := strings.Trim(ctx.Query("q"), " ")
 
-	ciTasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
+	ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
 			PageSize: setting.UI.IssuePagingNum,
@@ -84,6 +84,7 @@ func CloudBrains(ctx *context.Context) {
 		IsLatestVersion: modelarts.IsLatestVersion,
 		ComputeResource: listType,
 		Type:            models.TypeCloudBrainAll,
+		AiCenter:        aiCenter,
 		Cluster:         cluster,
 	})
 	if err != nil {
@@ -92,24 +93,25 @@ func CloudBrains(ctx *context.Context) {
 	}
 
 	models.LoadSpecs4CloudbrainInfo(ciTasks)
-	tasks := []*models.CloudbrainInfo{}
-
-	for _, task := range ciTasks {
-		if aiCenter == "" || aiCenter == task.Cloudbrain.Spec.AiCenterCode {
-			task.CanDebug = true
-			task.CanDel = true
-			task.Cloudbrain.ComputeResource = task.ComputeResource
-			tasks = append(tasks, task)
+
+	for i, task := range ciTasks {
+		ciTasks[i].CanDebug = true
+		ciTasks[i].CanDel = true
+		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
+
+		if ciTasks[i].Cloudbrain.Type == models.TypeC2Net {
+			ciTasks[i].Cloudbrain.Spec.Cluster = models.C2NetCluster
+		} else {
+			ciTasks[i].Cloudbrain.Spec.Cluster = models.OpenICluster
 		}
 	}
 
-	count := int64(len(tasks))
 	pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum))
 	pager.SetDefaultParams(ctx)
 	pager.AddParam(ctx, "listType", "ListType")
 	ctx.Data["Page"] = pager
 	ctx.Data["PageIsCloudBrain"] = true
-	ctx.Data["Tasks"] = tasks
+	ctx.Data["Tasks"] = ciTasks
 	ctx.Data["CanCreate"] = true
 	ctx.Data["Keyword"] = keyword
 

routers/user/home.go

@@ -812,7 +812,7 @@ func Cloudbrains(ctx *context.Context) {
 	for i, _ := range repos {
 		repoIDList = append(repoIDList, repos[i].ID)
 	}
-	ciTasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
+	ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
 			PageSize: setting.UI.IssuePagingNum,
@@ -828,29 +828,30 @@ func Cloudbrains(ctx *context.Context) {
 		RepoIDList:      repoIDList,
 		ComputeResource: listType,
 		Type:            models.TypeCloudBrainAll,
+		AiCenter:        aiCenter,
 		Cluster:         cluster,
 	})
 	if err != nil {
 		ctx.ServerError("Get job failed:", err)
 		return
 	}
-	models.LoadSpecs4CloudbrainInfo(ciTasks)
-	tasks := []*models.CloudbrainInfo{}
-	for _, task := range ciTasks {
-		if aiCenter == "" || aiCenter == task.Cloudbrain.Spec.AiCenterCode {
-			task.CanDebug = true
-			task.CanDel = true
-			task.Cloudbrain.ComputeResource = task.ComputeResource
-			tasks = append(tasks, task)
+	for i, _ := range ciTasks {
+		ciTasks[i].CanDebug = true
+		ciTasks[i].CanDel = true
+		ciTasks[i].Cloudbrain.ComputeResource = ciTasks[i].ComputeResource
+
+		if ciTasks[i].Cloudbrain.Type == models.TypeC2Net {
+			ciTasks[i].Cloudbrain.Spec.Cluster = models.C2NetCluster
+		} else {
+			ciTasks[i].Cloudbrain.Spec.Cluster = models.OpenICluster
 		}
 	}
-	count := int64(len(tasks))
 	pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum))
 	pager.SetDefaultParams(ctx)
 	pager.AddParam(ctx, "listType", "ListType")
 	ctx.Data["Page"] = pager
 	ctx.Data["PageIsUserCloudBrain"] = true
-	ctx.Data["Tasks"] = tasks
+	ctx.Data["Tasks"] = ciTasks
 	ctx.Data["CanCreate"] = true
 	ctx.Data["Keyword"] = keyword