diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index b3b07f352..e5a61b9a7 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -491,34 +491,22 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo } } taskRoles := jobRes.TaskRoles - if jobRes.JobStatus.State != string(models.JobFailed) { - - taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) - ctx.Data["taskRes"] = taskRes - task.Status = taskRes.TaskStatuses[0].State - task.ContainerID = taskRes.TaskStatuses[0].ContainerID - task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP - models.ParseAndSetDurationFromCloudBrainOne(jobRes, task) - - if task.DeletedAt.IsZero() { //normal record - err = models.UpdateJob(task) - if err != nil { - ctx.Data["error"] = err.Error() - return - } - } else { //deleted record - + taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) + ctx.Data["taskRes"] = taskRes + ctx.Data["ExitDiagnostics"] = taskRes.TaskStatuses[0].ExitDiagnostics + task.Status = taskRes.TaskStatuses[0].State + task.ContainerID = taskRes.TaskStatuses[0].ContainerID + task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP + models.ParseAndSetDurationFromCloudBrainOne(jobRes, task) + + if task.DeletedAt.IsZero() { //normal record + err = models.UpdateJob(task) + if err != nil { + ctx.Data["error"] = err.Error() + return } - } else { - task.Status = jobRes.JobStatus.State - taskRes := models.TaskPod{TaskStatuses: []models.TaskStatuses{ - { - State: jobRes.JobStatus.State, - }, - }} - ctx.Data["taskRes"] = taskRes - jobRes.JobStatus.StartTime = time.Unix(int64(task.CreatedUnix), 0).Format("2006-01-02 15:04:05") - jobRes.JobStatus.EndTime = time.Unix(int64(task.UpdatedUnix), 0).Format("2006-01-02 15:04:05") + } else { //deleted record + } ctx.Data["result"] = jobRes diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 932a588c3..63c947477 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -516,17 +516,21 @@ td, th { let podEventArray = podEvents[task0]; if(podEventArray != null){ for(var i=0; i < podEventArray.length;i++){ - html +="

[" +podEventArray[i]["reason"] + "]

"; - html +="

" +podEventArray[i]["message"] + "

"; - html +="

" +podEventArray[i]["action"] + "

"; + if (podEventArray[i]["reason"]!="") { + html +="

[" +podEventArray[i]["reason"] + "]

"; + html +="

" +podEventArray[i]["message"] + "

"; + html +="

" +podEventArray[i]["action"] + "

"; + } } } let extras= jsonObj["extras"]; if(extras != null){ for(var i=0; i < extras.length;i++){ - html +="

[" +extras[i]["reason"] + "]

"; - html +="

" +extras[i]["message"] + "

"; - html +="

" +extras[i]["action"] + "

"; + if (extras[i]["reason"]!="") { + html +="

[" +extras[i]["reason"] + "]

"; + html +="

" +extras[i]["message"] + "

"; + html +="

" +extras[i]["action"] + "

"; + } } } } diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 03673c072..3ddeeb247 100755 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -214,8 +214,9 @@ td, th {
@@ -376,11 +377,29 @@ td, th {
+
+
+ + + + + +
+ +
+ +
+ +
+
+
@@ -391,7 +410,7 @@ td, th {
-
+