From f1acf29f2da6af2b8b1bfeb380be413afd2a72b3 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 16 Feb 2022 16:24:07 +0800
Subject: [PATCH] fix-jobid

---
 routers/repo/cloudbrain.go         | 8 ++++----
 routers/routes/routes.go           | 4 +++-
 templates/repo/debugjob/index.tmpl | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 0599fb03f..cea87feec 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -351,13 +351,13 @@ func CloudBrainShow(ctx *context.Context) {
 func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
 	ctx.Data["PageIsCloudBrain"] = true
 
-	var jobID = ctx.Params(":jobid")
-	task, err := models.GetCloudbrainByJobID(jobID)
+	var jobName = ctx.Params(":jobname")
+	task, err := models.GetCloudbrainByName(jobName)
 	if err != nil {
 		ctx.Data["error"] = err.Error()
 	}
 
-	result, err := cloudbrain.GetJob(jobID)
+	result, err := cloudbrain.GetJob(task.JobID)
 	if err != nil {
 		ctx.Data["error"] = err.Error()
 	}
@@ -422,7 +422,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
 
 	ctx.Data["duration"] = util.AddZero(duration/3600000) + ":" + util.AddZero(duration%3600000/60000) + ":" + util.AddZero(duration%60000/1000)
 	ctx.Data["task"] = task
-	ctx.Data["jobID"] = jobID
+	ctx.Data["jobID"] = task.JobID
 	ctx.Data["jobName"] = task.JobName
 	version_list_task := make([]*models.Cloudbrain, 0)
 	version_list_task = append(version_list_task, task)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index aa85b8f2b..de355352f 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -974,8 +974,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 		}, context.RepoRef())
 
 		m.Group("/cloudbrain", func() {
-			m.Group("/:jobid", func() {
+			m.Group("/:jobname", func() {
 				m.Get("", reqRepoCloudBrainReader, repo.CloudBrainShow)
+			})
+			m.Group("/:jobid", func() {
 				m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDebug)
 				m.Post("/commit_image", cloudbrain.AdminOrJobCreaterRight, bindIgnErr(auth.CommitImageCloudBrainForm{}), repo.CloudBrainCommitImage)
 				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop)
diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl
index f7773cf2d..8cf58dc4f 100755
--- a/templates/repo/debugjob/index.tmpl
+++ b/templates/repo/debugjob/index.tmpl
@@ -287,7 +287,7 @@
                             <div class="row">
                                 <!-- 任务名 -->
                                 <div class="four wide column">
-                                    <a class="title" href='{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}'  title="{{.JobName}}" style="font-size: 14px;">
+                                    <a class="title" href='{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain/{{.JobName}}{{else}}{{$.RepoLink}}/modelarts/notebook/{{.JobID}}{{end}}'  title="{{.JobName}}" style="font-size: 14px;">
                                         <span class="fitted text_over" style="width: 90%;vertical-align: middle;">{{.JobName}}</span>
                                     </a>
                                 </div>