routers/api/v1/repo/cloudbrain_dashboard.go

@@ -736,6 +736,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 
 		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
@@ -758,9 +759,6 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		taskDetail.FlavorName, _ = repo.GetCloudbrainFlavorName(ciTasks[i].Cloudbrain)
 
 		taskDetail.WaitTime = repo.GetCloudbrainWaitTime(ciTasks[i].Cloudbrain)
-		if ciTasks[i].Cloudbrain.Type == models.TypeCloudBrainTwo || (ciTasks[i].Cloudbrain.Type == models.TypeCloudBrainOne && ciTasks[i].Cloudbrain.JobType == "TRAIN") {
-			taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
-		}
 
 		if ciTasks[i].Cloudbrain.DeletedAt != nilTime {
 			taskDetail.IsDelete = true