fix-3124

routers/admin/cloudbrains.go

@@ -70,7 +70,7 @@ func CloudBrains(ctx *context.Context) {
 
 	keyword := strings.Trim(ctx.Query("q"), " ")
 
-	ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
+	ciTasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
 			PageSize: setting.UI.IssuePagingNum,
@@ -84,7 +84,6 @@ func CloudBrains(ctx *context.Context) {
 		IsLatestVersion: modelarts.IsLatestVersion,
 		ComputeResource: listType,
 		Type:            models.TypeCloudBrainAll,
-		AiCenter:        aiCenter,
 		Cluster:         cluster,
 	})
 	if err != nil {
@@ -93,19 +92,24 @@ func CloudBrains(ctx *context.Context) {
 	}
 
 	models.LoadSpecs4CloudbrainInfo(ciTasks)
-
-	for i, task := range ciTasks {
-		ciTasks[i].CanDebug = true
-		ciTasks[i].CanDel = true
-		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
+	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)
+		}
 	}
 
+	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"] = ciTasks
+	ctx.Data["Tasks"] = tasks
 	ctx.Data["CanCreate"] = true
 	ctx.Data["Keyword"] = keyword
 

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -732,7 +732,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 
 	keyword := strings.Trim(ctx.Query("q"), " ")
 
-	ciTasks, count, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+	ciTasks, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
 			PageSize: pageSize,
@@ -747,8 +747,8 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		NeedRepoInfo:    true,
 		BeginTimeUnix:   int64(recordBeginTime),
 		EndTimeUnix:     endTime.Unix(),
-		AiCenter:        aiCenter,
-		NeedDeleteInfo:  needDeleteInfo,
+		// AiCenter:        aiCenter,
+		NeedDeleteInfo: needDeleteInfo,
 	})
 	if err != nil {
 		ctx.ServerError("Get job failed:", err)
@@ -758,43 +758,45 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 	nilTime := time.Time{}
 	tasks := []models.TaskDetail{}
 	for i, task := range ciTasks {
-		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
-		var taskDetail models.TaskDetail
-		taskDetail.ID = ciTasks[i].Cloudbrain.ID
-		taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
-		taskDetail.JobName = ciTasks[i].JobName
-		taskDetail.DisplayJobName = ciTasks[i].DisplayJobName
-		taskDetail.Status = ciTasks[i].Status
-		taskDetail.JobType = ciTasks[i].JobType
-		taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix
-		taskDetail.RunTime = ciTasks[i].Cloudbrain.TrainJobDuration
-		taskDetail.StartTime = ciTasks[i].StartTime
-		taskDetail.EndTime = ciTasks[i].EndTime
-		taskDetail.ComputeResource = ciTasks[i].ComputeResource
-		taskDetail.Type = ciTasks[i].Cloudbrain.Type
-		taskDetail.UserName = ciTasks[i].User.Name
-		taskDetail.RepoID = ciTasks[i].RepoID
-		if ciTasks[i].Repo != nil {
-			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
-			taskDetail.RepoAlias = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Alias
-		}
-		if ciTasks[i].Cloudbrain.WorkServerNumber >= 1 {
-			taskDetail.WorkServerNum = int64(ciTasks[i].Cloudbrain.WorkServerNumber)
-		} else {
-			taskDetail.WorkServerNum = 1
-		}
-		taskDetail.CardDuration = repo.GetCloudbrainCardDuration(ciTasks[i].Cloudbrain)
-		taskDetail.WaitTime = repo.GetCloudbrainWaitTime(ciTasks[i].Cloudbrain)
+		if aiCenter == "" || aiCenter == task.Cloudbrain.Spec.AiCenterCode {
+			ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
+			var taskDetail models.TaskDetail
+			taskDetail.ID = ciTasks[i].Cloudbrain.ID
+			taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
+			taskDetail.JobName = ciTasks[i].JobName
+			taskDetail.DisplayJobName = ciTasks[i].DisplayJobName
+			taskDetail.Status = ciTasks[i].Status
+			taskDetail.JobType = ciTasks[i].JobType
+			taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix
+			taskDetail.RunTime = ciTasks[i].Cloudbrain.TrainJobDuration
+			taskDetail.StartTime = ciTasks[i].StartTime
+			taskDetail.EndTime = ciTasks[i].EndTime
+			taskDetail.ComputeResource = ciTasks[i].ComputeResource
+			taskDetail.Type = ciTasks[i].Cloudbrain.Type
+			taskDetail.UserName = ciTasks[i].User.Name
+			taskDetail.RepoID = ciTasks[i].RepoID
+			if ciTasks[i].Repo != nil {
+				taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
+				taskDetail.RepoAlias = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Alias
+			}
+			if ciTasks[i].Cloudbrain.WorkServerNumber >= 1 {
+				taskDetail.WorkServerNum = int64(ciTasks[i].Cloudbrain.WorkServerNumber)
+			} else {
+				taskDetail.WorkServerNum = 1
+			}
+			taskDetail.CardDuration = repo.GetCloudbrainCardDuration(ciTasks[i].Cloudbrain)
+			taskDetail.WaitTime = repo.GetCloudbrainWaitTime(ciTasks[i].Cloudbrain)
 
-		if ciTasks[i].Cloudbrain.DeletedAt != nilTime || ciTasks[i].Repo == nil {
-			taskDetail.IsDelete = true
-		} else {
-			taskDetail.IsDelete = false
+			if ciTasks[i].Cloudbrain.DeletedAt != nilTime || ciTasks[i].Repo == nil {
+				taskDetail.IsDelete = true
+			} else {
+				taskDetail.IsDelete = false
+			}
+			taskDetail.Spec = ciTasks[i].Spec
+			tasks = append(tasks, taskDetail)
 		}
-		taskDetail.Spec = ciTasks[i].Spec
-		tasks = append(tasks, taskDetail)
 	}
-
+	count := int64(len(tasks))
 	pager := context.NewPagination(int(count), pageSize, page, getTotalPage(count, pageSize))
 	pager.SetDefaultParams(ctx)
 	pager.AddParam(ctx, "listType", "ListType")

routers/user/home.go

@@ -812,7 +812,7 @@ func Cloudbrains(ctx *context.Context) {
 	for i, _ := range repos {
 		repoIDList = append(repoIDList, repos[i].ID)
 	}
-	ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
+	ciTasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
 			PageSize: setting.UI.IssuePagingNum,
@@ -828,7 +828,6 @@ func Cloudbrains(ctx *context.Context) {
 		RepoIDList:      repoIDList,
 		ComputeResource: listType,
 		Type:            models.TypeCloudBrainAll,
-		AiCenter:        aiCenter,
 		Cluster:         cluster,
 	})
 	if err != nil {
@@ -836,18 +835,22 @@ func Cloudbrains(ctx *context.Context) {
 		return
 	}
 	models.LoadSpecs4CloudbrainInfo(ciTasks)
-	for i, task := range ciTasks {
-		ciTasks[i].CanDebug = true
-		ciTasks[i].CanDel = true
-		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
+	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)
+		}
 	}
-
+	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"] = ciTasks
+	ctx.Data["Tasks"] = tasks
 	ctx.Data["CanCreate"] = true
 	ctx.Data["Keyword"] = keyword