From 5dff96fe210290c070e0b7b0ccb7baefa6e9e24a Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 8 Dec 2021 15:03:13 +0800
Subject: [PATCH] fix issue

---
 routers/repo/modelarts.go            |  4 ++--
 templates/repo/cloudbrain/index.tmpl | 26 ++++++++------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 6047de980..9a4150d8e 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -71,7 +71,7 @@ func DebugJobIndex(ctx *context.Context) {
 			} else {
 				ciTasks[i].CanDebug = false
 			}
-			ciTasks[i].CanDel = cloudbrain.CanDeleteDebugJob(ctx, &task.Cloudbrain)
+			ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
 			ciTasks[i].Cloudbrain.ComputeResource = modelarts.GPUResource
 		}
 		if task.Cloudbrain.Type == models.TypeCloudBrainTwo {
@@ -80,7 +80,7 @@ func DebugJobIndex(ctx *context.Context) {
 			} else {
 				ciTasks[i].CanDebug = false
 			}
-			ciTasks[i].CanDel = cloudbrain.CanDeleteDebugJob(ctx, &task.Cloudbrain)
+			ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
 			ciTasks[i].Cloudbrain.ComputeResource = modelarts.NPUResource
 		}
 
diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl
index 936a5cfcf..641fefb79 100755
--- a/templates/repo/cloudbrain/index.tmpl
+++ b/templates/repo/cloudbrain/index.tmpl
@@ -368,19 +368,19 @@
                                         </a>
                                         {{else}}
                                         <a  class="ui basic disabled button">
-                                            {{$.i18n.Tr "repo.debug"}}
+                                            {{.CanDebug}}{{$.i18n.Tr "repo.debug"}}
                                         </a>
                                         {{end}}
                                         <!-- 停止 -->
                                         <form id="stopForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/stop" method="post" style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
-                                            <a id="stop-model-debug-{{.JobID}}" class="ui basic {{if or (eq .Status "STOPPED") (eq .Status "FAILED")}}disabled {{else}}blue {{end}}button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
+                                            <a id="stop-model-debug-{{.JobID}}" class='ui basic {{if or (eq .Status "STOPPED") (eq .Status "FAILED")}}disabled {{else}}blue {{end}}button' onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
                                                 {{$.i18n.Tr "repo.stop"}}
                                             </a>
                                             {{else}}
                                             <a  class="ui basic disabled button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
-                                                    {{.CanDel}}{{$.i18n.Tr "repo.stop"}}
+                                                {{.CanDel}}{{$.i18n.Tr "repo.stop"}}
                                             </a>
                                             {{end}}
                                         </form>                                        
@@ -393,8 +393,8 @@
                                         
                                         <!-- 接收结果 -->
                                         <iframe src="" frameborder="0" name="iframeContent" style="display: none;"></iframe>
-                                        {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
-                                        <a id="model-image-{{.JobID}}" class="imageBtn ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" value="{{.CanDebug}}">{{$.i18n.Tr "repo.submit_image"}}</a>
+                                        {{if .CanDel}}
+                                        <a id="model-image-{{.JobID}}" class='imageBtn ui basic {{if ne .Status "RUNNING"}}disabled {{else}}blue {{end}}button' value="{{.CanDebug}}">{{$.i18n.Tr "repo.submit_image"}}</a>
                                         {{else}}
                                         <a  class="imageBtn ui basic disabled button" value="{{.CanDebug}}">{{$.i18n.Tr "repo.submit_image"}}</a>
                                         {{end}}
@@ -404,7 +404,7 @@
                                     <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
                                         {{$.CsrfTokenHtml}}
                                         {{if .CanDel}}
-                                        <a id="model-delete-{{.JobID}}" class='ui basic button {{if eq .Status "STOPPED" "FAILED"}}blue{{else}}disabled{{end}}' onclick="assertDelete(this)" style="border-radius: .28571429rem;">
+                                        <a id="model-delete-{{.JobID}}" class='ui basic button {{if eq .Status "STOPPED" "FAILED"}} blue {{else}} disabled {{end}}' onclick="assertDelete(this)" style="border-radius: .28571429rem;">
                                             {{.CanDel}}{{$.i18n.Tr "repo.delete"}}
                                         </a>
                                         {{else}}
@@ -542,10 +542,6 @@
                     console.log("---------")
                     $('#' + jobID+'-icon').removeClass().addClass(status)
                     $('#' + jobID+ '-text').text(status)
-                    
-                    //if (status == 'STOPPED') {
-                        // window.location.reload()
-                    //}
                 }
                 if(status==="RUNNING"){
                     console.log("----------",status,$('#model-debug-'+jobID))
@@ -558,6 +554,8 @@
                 if(status==="STOPPED" || status==="FAILED"){
                     $('#model-delete-'+jobID).removeClass('disabled')
                     $('#model-delete-'+jobID).addClass('blue')
+                    $('#stop-model-debug-'+jobID).removeClass('blue')
+                    $('#stop-model-debug-'+jobID).addClass('disabled')
                 }
                 if(status!=="RUNNING"){
                     $('#model-debug-'+jobID).removeClass('blue')
@@ -569,14 +567,6 @@
                 if(status!=="STOPPED" || status!=="FAILED"){
                    $('#stop-model-debug-'+jobID).removeClass('disabled')
                    $('#stop-model-debug-'+jobID).addClass('blue')
-                //    $('#model-delete-'+jobID).removeClass('red')
-                //    $('#model-delete-'+jobID).addClass('disabled')
-                }
-                if(status=="STOPPED" || status=="FAILED"){
-                   $('#stop-model-debug-'+jobID).removeClass('blue')
-                   $('#stop-model-debug-'+jobID).addClass('disabled')
-                //    $('#model-delete-'+jobID).removeClass('disabled')
-                //    $('#model-delete-'+jobID).addClass('red')
                 }
             }).fail(function(err) {
                 console.log(err);