From efdbc20ed18e9a3f7cfff885281182f0a2faf841 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Wed, 23 Mar 2022 11:48:35 +0800
Subject: [PATCH] download model

---
 routers/repo/cloudbrain.go                   |  1 -
 templates/repo/cloudbrain/trainjob/show.tmpl | 40 +++++++++++++++-------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 28ea5479c..ce4889042 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -1452,7 +1452,6 @@ func getTrainJobCommand(form auth.CreateCloudBrainForm) (string, error) {
 	}
 
 	command += "python /code/" + bootFile
-	log.Info("command:" + command)
 
 	return command, nil
 }
diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index aeb0c6b5e..040ad612d 100755
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -412,15 +412,16 @@ td, th {
     
     let userName
     let repoPath
-    let jobName
+    let jobID
     let downlaodFlag = {{$.canDownload}}
     let taskID = {{$.task.ID}}
+    let realJobName = {{$.task.JobName}}
     $(document).ready(function(){
         let url = window.location.href;
         let urlArr = url.split('/')
         userName = urlArr.slice(-5)[0]
         repoPath = urlArr.slice(-4)[0]
-        jobName = urlArr.slice(-1)[0]
+        jobID = urlArr.slice(-1)[0]
     })
     function stopBubbling(e) {
         e = window.event || e;
@@ -449,23 +450,24 @@ td, th {
         parents = parents || ''
         filename = filename || ''
         init = init || ''
+        console.log("start")
         $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/train-job/${jobID}/model_list?version_name=${version_name}&parentDir=${parents}`, (data) => {
-                $(`#dir_list${version_name}`).empty() 
-                renderDir(data,version_name)
-                if(init==="init"){
-                    $(`input[name=model${version_name}]`).val("")
-                    $(`input[name=modelback${version_name}]`).val(version_name)
-                    $(`#file_breadcrumb${version_name}`).empty()
-                    let htmlBread = ""
-                    htmlBread += `<div class='active section'>${version_name}</div>`
-                    htmlBread += "<div class='divider'> / </div>" 
-                    $(`#file_breadcrumb${version_name}`).append(htmlBread)
-                }else{
-                    renderBrend(version_name,parents,filename,init)
-                }
-            }).fail(function(err) {
-                console.log(err,version_name);
-            });
+            $(`#dir_list${version_name}`).empty() 
+            renderDir(data,version_name)
+            if(init==="init"){
+                $(`input[name=model${version_name}]`).val("")
+                $(`input[name=modelback${version_name}]`).val(version_name)
+                $(`#file_breadcrumb${version_name}`).empty()
+                let htmlBread = ""
+                htmlBread += `<div class='active section'>${version_name}</div>`
+                htmlBread += "<div class='divider'> / </div>" 
+                $(`#file_breadcrumb${version_name}`).append(htmlBread)
+            }else{
+                renderBrend(version_name,parents,filename,init)
+            }
+        }).fail(function(err) {
+            console.log(err,version_name);
+        });
         
     }
     function renderBrend(version_name,parents,filename,init){
@@ -515,7 +517,7 @@ td, th {
                     html += "<span class='fitted'><i class='folder icon' width='16' height='16' aria-hidden='true'></i>" + data.Dirs[i].FileName + "</span>"
                 }else{
                     if(downlaodFlag){
-                        html += `<a href="${location.href}/model_download?version_name=${version_name}&file_name=${data.Dirs[i].FileName}&parent_dir=${data.Dirs[i].ParenDir}">`
+                        html += `<a href="${location.href}/download_model?version_name=${version_name}&fileName=${data.Dirs[i].FileName}&parentDir=${data.Dirs[i].ParenDir}&jobName=${realJobName}">`
                     }
                     else{
                         html += `<a class="disabled">`