Merge branch 'V20220228' into zouap_user

routers/repo/modelarts.go

@@ -1453,6 +1453,7 @@ func TrainJobShow(ctx *context.Context) {
 	ctx.Data["jobName"] = VersionListTasks[0].JobName
 	ctx.Data["version_list_task"] = VersionListTasks
 	ctx.Data["version_list_count"] = VersionListCount
+	ctx.Data["canDownload"] = cloudbrain.CanDeleteJob(ctx, &VersionListTasks[0].Cloudbrain)
 	ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow)
 }
 
@@ -2052,6 +2053,7 @@ func InferenceJobShow(ctx *context.Context) {
 	ctx.Data["jobID"] = jobID
 	ctx.Data["jobName"] = task.JobName
 	ctx.Data["task"] = task
+	ctx.Data["canDownload"] = cloudbrain.CanDeleteJob(ctx, task)
 
 	tempUids := []int64{}
 	tempUids = append(tempUids, task.UserID)

templates/repo/modelarts/inferencejob/show.tmpl

@@ -469,13 +469,13 @@ td, th {
 </div>
 {{template "base/footer" .}}
 <script>
-    console.log({{.task}})
 $(document).ready(function(){
     $('.secondary.menu .item').tab();
 });
 let userName
 let repoPath
 let jobID
+let downlaodFlag = {{$.canDownload }}
 $(document).ready(function(){
     let url = window.location.href;
     let urlArr = url.split('/')
@@ -621,7 +621,12 @@ function renderDir(data,version_name){
                 html += `<a  onclick="loadModelFile('${version_name}','${data.Dirs[i].ParenDir}','${data.Dirs[i].FileName}','folder')">`
                 html += "<span class='fitted'><i class='folder icon' width='16' height='16' aria-hidden='true'></i>" + data.Dirs[i].FileName + "</span>"
             }else{
-                html += `<a href="${location.href}/result_download?version_name=${version_name}&file_name=${data.Dirs[i].FileName}&parent_dir=${data.Dirs[i].ParenDir}">`
+                if(downlaodFlag){
+                    html += `<a href="${location.href}/result_download?version_name=${version_name}&file_name=${data.Dirs[i].FileName}&parent_dir=${data.Dirs[i].ParenDir}">`
+                }
+                else{
+                    html += `<a class="disabled">`
+                }
                 html += "<span class='fitted'><i class='file icon' width='16' height='16' aria-hidden='true'></i>" + data.Dirs[i].FileName + "</span>"
             }
             html += '</a>'

templates/repo/modelarts/trainjob/show.tmpl

@@ -532,6 +532,7 @@ td, th {
     let userName
     let repoPath
     let jobID
+    let downlaodFlag = {{$.canDownload }}
     $(document).ready(function(){
         let url = window.location.href;
         let urlArr = url.split('/')
@@ -787,7 +788,12 @@ td, th {
                     html += `<a  onclick="loadModelFile('${version_name}','${data.Dirs[i].ParenDir}','${data.Dirs[i].FileName}','folder')">`
                     html += "<span class='fitted'><i class='folder icon' width='16' height='16' aria-hidden='true'></i>" + data.Dirs[i].FileName + "</span>"
                 }else{
-                    html += `<a href="${location.href}/model_download?version_name=${version_name}&file_name=${data.Dirs[i].FileName}&parent_dir=${data.Dirs[i].ParenDir}">`
+                    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}">`
+                    }
+                    else{
+                        html += `<a class="disabled">`
+                    }
                     html += "<span class='fitted'><i class='file icon' width='16' height='16' aria-hidden='true'></i>" + data.Dirs[i].FileName + "</span>"
                 }
                 html += '</a>'