From a69443231f2a79328444156bfe1f5f28e45f3103 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Thu, 7 Apr 2022 18:01:11 +0800
Subject: [PATCH 1/3] get restart

---
 routers/repo/modelarts.go | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 3f835ee5d..f3c78d039 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -249,7 +249,7 @@ func NotebookShow(ctx *context.Context) {
 	debugListType := ctx.Query("debugListType")
 
 	var ID = ctx.Params(":id")
-	task, err := models.GetCloudbrainByID(ID)
+	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	if err != nil {
 		ctx.Data["error"] = err.Error()
 		ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil)
@@ -264,16 +264,22 @@ func NotebookShow(ctx *context.Context) {
 	}
 
 	if result != nil {
-		task.Status = result.Status
-		err = models.UpdateJob(task)
-		if err != nil {
-			ctx.Data["error"] = err.Error()
-			ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil)
-			return
+		if task.DeletedAt.IsZero() { //normal record
+			if task.Status != result.Status {
+				task.Status = result.Status
+				err = models.UpdateJob(task)
+				if err != nil {
+					ctx.Data["error"] = err.Error()
+					ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil)
+					return
+				}
+			}
+		} else { //deleted record
+
 		}
 
-		result.CreateTime = time.Unix(int64(result.CreateAt/1000), 0).Format("2006-01-02 15:04:05")
-		result.LatestUpdateTime = time.Unix(int64(result.UpdateAt/1000), 0).Format("2006-01-02 15:04:05")
+		//result.CreateTime = time.Unix(int64(result.CreateAt/1000), 0).Format("2006-01-02 15:04:05")
+		//result.LatestUpdateTime = time.Unix(int64(result.UpdateAt/1000), 0).Format("2006-01-02 15:04:05")
 	}
 
 	datasetDownloadLink := "-"
@@ -319,7 +325,7 @@ func NotebookShow(ctx *context.Context) {
 	ctx.Data["task"] = task
 	ctx.Data["ID"] = ID
 	ctx.Data["jobName"] = task.JobName
-	ctx.Data["result"] = result
+	//ctx.Data["result"] = result
 	ctx.Data["debugListType"] = debugListType
 	ctx.HTML(200, tplModelArtsNotebookShow)
 }

From 914cef287d089552205ebc4b37b27cffd4aeed3b Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Fri, 8 Apr 2022 10:33:41 +0800
Subject: [PATCH 2/3] mod restart time

---
 templates/repo/modelarts/notebook/show.tmpl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl
index 684ad99a1..70a68fed4 100755
--- a/templates/repo/modelarts/notebook/show.tmpl
+++ b/templates/repo/modelarts/notebook/show.tmpl
@@ -282,8 +282,11 @@ td, th {
 
                                                         <td class="ti-text-form-content">
                                                             <div class="text-span text-span-w" id="updateTime">
-                                                                
-																 {{TimeSinceUnix1 .UpdatedUnix}}
+                                                                {{if not (eq .EndTime 0)}}
+																 {{TimeSinceUnix1 .EndTime}}
+																{{else}}
+																{{TimeSinceUnix1 .UpdatedUnix}}
+																{{end}}
 																
                                                             </div>
                                                         </td>

From bb44f675c021443fbec70f3e5b4f7f388cf8d27c Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Fri, 8 Apr 2022 14:29:52 +0800
Subject: [PATCH 3/3] del unuse code

---
 routers/repo/modelarts.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 0b3405bcb..933571a0b 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -277,9 +277,6 @@ func NotebookShow(ctx *context.Context) {
 		} else { //deleted record
 
 		}
-
-		//result.CreateTime = time.Unix(int64(result.CreateAt/1000), 0).Format("2006-01-02 15:04:05")
-		//result.LatestUpdateTime = time.Unix(int64(result.UpdateAt/1000), 0).Format("2006-01-02 15:04:05")
 	}
 
 	datasetDownloadLink := "-"
@@ -325,7 +322,6 @@ func NotebookShow(ctx *context.Context) {
 	ctx.Data["task"] = task
 	ctx.Data["ID"] = ID
 	ctx.Data["jobName"] = task.JobName
-	//ctx.Data["result"] = result
 	ctx.Data["debugListType"] = debugListType
 	ctx.HTML(200, tplModelArtsNotebookShow)
 }