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

Merge branch 'V20220801' into fix-1940

tags/v1.22.7.2^2
chenshihai 3 years ago
parent
ba2b2daa22 eb3582e537
commit
b07016355a
7 changed files with 14 additions and 14 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      routers/repo/modelarts.go
  2. +2
    -2
      templates/repo/cloudbrain/benchmark/show.tmpl
  3. +2
    -2
      templates/repo/cloudbrain/inference/show.tmpl
  4. +2
    -2
      templates/repo/cloudbrain/show.tmpl
  5. +2
    -2
      templates/repo/cloudbrain/trainjob/show.tmpl
  6. +2
    -2
      templates/repo/modelarts/notebook/show.tmpl
  7. +3
    -3
      web_src/js/components/Model.vue

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

@@ -545,7 +545,7 @@ func NotebookDel(ctx *context.Context) {
var listType = ctx.Query("debugListType")
task := ctx.Cloudbrain

if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped) {
if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped) && task.Status != string(models.ModelArtsDeleted) {
log.Error("the job(%s) has not been stopped", task.JobName)
ctx.RenderWithErr("the job has not been stopped", tplDebugJobIndex, nil)
return


+ 2
- 2
templates/repo/cloudbrain/benchmark/show.tmpl View File

@@ -353,14 +353,14 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w" id="{{.VersionName}}-mirror">
<span class="ui poping up clipboard" title="{{.Image}}" data-position="top center" id="clipboard-btn" style="cursor:pointer"
<span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer"
data-clipboard-text="{{.Image}}"
data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
data-content="{{$.i18n.Tr "repo.copy_link"}}"
data-variation="inverted tiny"
>
{{.Image}}
<span title="{{.Image}}">{{.Image}}</span>
</span>
</div>
</td>


+ 2
- 2
templates/repo/cloudbrain/inference/show.tmpl View File

@@ -381,14 +381,14 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w" id="{{.VersionName}}-mirror">
<span class="ui poping up clipboard" title="{{.Image}}" data-position="top center" id="clipboard-btn" style="cursor:pointer"
<span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer"
data-clipboard-text="{{.Image}}"
data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
data-content="{{$.i18n.Tr "repo.copy_link"}}"
data-variation="inverted tiny"
>
{{.Image}}
<span title="{{.Image}}">{{.Image}}</span>
</span>
</div>
</td>


+ 2
- 2
templates/repo/cloudbrain/show.tmpl View File

@@ -392,14 +392,14 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w" id="{{.VersionName}}-mirror">
<span class="ui poping up clipboard" title="{{.Image}}" data-position="top center" id="clipboard-btn" style="cursor:pointer"
<span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer"
data-clipboard-text="{{.Image}}"
data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
data-content="{{$.i18n.Tr "repo.copy_link"}}"
data-variation="inverted tiny"
>
{{.Image}}
<span title="{{.Image}}">{{.Image}}</span>
</span>
</div>
</td>


+ 2
- 2
templates/repo/cloudbrain/trainjob/show.tmpl View File

@@ -384,14 +384,14 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w" id="{{.VersionName}}-mirror">
<span class="ui poping up clipboard" title="{{.Image}}" data-position="top center" id="clipboard-btn" style="cursor:pointer"
<span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer"
data-clipboard-text="{{.Image}}"
data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
data-content="{{$.i18n.Tr "repo.copy_link"}}"
data-variation="inverted tiny"
>
{{.Image}}
<span title="{{.Image}}">{{.Image}}</span>
</span>
</div>
</td>


+ 2
- 2
templates/repo/modelarts/notebook/show.tmpl View File

@@ -359,14 +359,14 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w" id="{{.VersionName}}-mirror">
<span class="ui poping up clipboard" title="{{.Image}}" data-position="top center" id="clipboard-btn" style="cursor:pointer"
<span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer"
data-clipboard-text="{{.Image}}"
data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
data-content="{{$.i18n.Tr "repo.copy_link"}}"
data-variation="inverted tiny"
>
{{.Image}}
<span title="{{.Image}}">{{.Image}}</span>
</span>
</div>
</td>


+ 3
- 3
web_src/js/components/Model.vue View File

@@ -106,7 +106,7 @@
<div class="space-around">
<a :style="{visibility:!scope.row.Children ? 'visible':'hidden'}" :class="{'disabled':!scope.row.IsCanOper}" @click="showcreateVue(scope.row.Name,scope.row.Version,scope.row.Label)">创建新版本</a>
<a :href="loadhref+scope.row.ID" :class="{'disabled':!scope.row.IsCanOper}">下载</a>
<a :class="{'disabled':!scope.row.IsCanDelete}" @click="deleteModel(scope.row.ID,scope.row.cName)">删除</a>
<a :class="{'disabled':!scope.row.IsCanDelete}" @click="deleteModel(scope.row.ID,scope.row.cName,scope.row.rowKey)">删除</a>
</div>
</template>
@@ -332,8 +332,8 @@ export default {
}
},
deleteModel(id,name){
let row={cName:name,ID:id}
deleteModel(id,name,rowKey){
let row={cName:name,ID:id, rowKey: rowKey}
let _this = this
let flag=1
$('.ui.basic.modal.first')


Write Preview
Loading…
Cancel
Save