OpenI
/
aiforge
Not watched
1
0
Fork 0
Code
Releases 128 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

fix issue

pull/1071/head
zhoupzh 3 years ago
parent
a0ecac1162
commit
5dff96fe21
2 changed files with 10 additions and 20 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      routers/repo/modelarts.go
  2. +8
    -18
      templates/repo/cloudbrain/index.tmpl

+ 2
- 2
routers/repo/modelarts.go View File

@@ -71,7 +71,7 @@ func DebugJobIndex(ctx *context.Context) {
} else { } else {
ciTasks[i].CanDebug = false 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 ciTasks[i].Cloudbrain.ComputeResource = modelarts.GPUResource
} }
if task.Cloudbrain.Type == models.TypeCloudBrainTwo { if task.Cloudbrain.Type == models.TypeCloudBrainTwo {
@@ -80,7 +80,7 @@ func DebugJobIndex(ctx *context.Context) {
} else { } else {
ciTasks[i].CanDebug = false 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 ciTasks[i].Cloudbrain.ComputeResource = modelarts.NPUResource
} }




+ 8
- 18
templates/repo/cloudbrain/index.tmpl View File

@@ -368,19 +368,19 @@
</a> </a>
{{else}} {{else}}
<a class="ui basic disabled button"> <a class="ui basic disabled button">
{{$.i18n.Tr "repo.debug"}}
{{.CanDebug}}{{$.i18n.Tr "repo.debug"}}
</a> </a>
{{end}} {{end}}
<!-- 停止 --> <!-- 停止 -->
<form id="stopForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/stop" method="post" style="margin-left:-1px;"> <form id="stopForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/stop" method="post" style="margin-left:-1px;">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
{{if .CanDel}} {{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"}} {{$.i18n.Tr "repo.stop"}}
</a> </a>
{{else}} {{else}}
<a class="ui basic disabled button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();"> <a class="ui basic disabled button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
{{.CanDel}}{{$.i18n.Tr "repo.stop"}}
{{.CanDel}}{{$.i18n.Tr "repo.stop"}}
</a> </a>
{{end}} {{end}}
</form> </form>
@@ -393,8 +393,8 @@
<!-- 接收结果 --> <!-- 接收结果 -->
<iframe src="" frameborder="0" name="iframeContent" style="display: none;"></iframe> <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}} {{else}}
<a class="imageBtn ui basic disabled button" value="{{.CanDebug}}">{{$.i18n.Tr "repo.submit_image"}}</a> <a class="imageBtn ui basic disabled button" value="{{.CanDebug}}">{{$.i18n.Tr "repo.submit_image"}}</a>
{{end}} {{end}}
@@ -404,7 +404,7 @@
<form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post"> <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
{{if .CanDel}} {{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"}} {{.CanDel}}{{$.i18n.Tr "repo.delete"}}
</a> </a>
{{else}} {{else}}
@@ -542,10 +542,6 @@
console.log("---------") console.log("---------")
$('#' + jobID+'-icon').removeClass().addClass(status) $('#' + jobID+'-icon').removeClass().addClass(status)
$('#' + jobID+ '-text').text(status) $('#' + jobID+ '-text').text(status)
//if (status == 'STOPPED') {
// window.location.reload()
//}
} }
if(status==="RUNNING"){ if(status==="RUNNING"){
console.log("----------",status,$('#model-debug-'+jobID)) console.log("----------",status,$('#model-debug-'+jobID))
@@ -558,6 +554,8 @@
if(status==="STOPPED" || status==="FAILED"){ if(status==="STOPPED" || status==="FAILED"){
$('#model-delete-'+jobID).removeClass('disabled') $('#model-delete-'+jobID).removeClass('disabled')
$('#model-delete-'+jobID).addClass('blue') $('#model-delete-'+jobID).addClass('blue')
$('#stop-model-debug-'+jobID).removeClass('blue')
$('#stop-model-debug-'+jobID).addClass('disabled')
} }
if(status!=="RUNNING"){ if(status!=="RUNNING"){
$('#model-debug-'+jobID).removeClass('blue') $('#model-debug-'+jobID).removeClass('blue')
@@ -569,14 +567,6 @@
if(status!=="STOPPED" || status!=="FAILED"){ if(status!=="STOPPED" || status!=="FAILED"){
$('#stop-model-debug-'+jobID).removeClass('disabled') $('#stop-model-debug-'+jobID).removeClass('disabled')
$('#stop-model-debug-'+jobID).addClass('blue') $('#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) { }).fail(function(err) {
console.log(err); console.log(err);


Write Preview
Loading…
Cancel
Save