From 90a387f470fdd989d526c7ce219fec760f6f9172 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 11:55:28 +0800 Subject: [PATCH 1/6] fix issue --- templates/repo/modelarts/trainjob/show.tmpl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 580940289..f22a2ce56 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -487,8 +487,8 @@
- - {{$.i18n.Tr "repo.modelarts.download_log"}} @@ -734,6 +734,12 @@ // detail status and duration $('#' + version_name + '-duration').text(data.JobDuration) $('#' + version_name + '-status').text(data.JobStatus) + console.log(data) + if (["KILLED", "FAILED", "START_FAILED", "STOPPED", "COMPLETED"].includes(data.JobStatus)) { + $(`#${version_name}-log-down`).removeClass('disabled').addClass('ti-download-file') + $('#' + version_name + '-stop').addClass('disabled') + } + loadLog(version_name) From 9d45a49e73379caa1b0877438b9bf7e01d7a5dbd Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 15:11:32 +0800 Subject: [PATCH 2/6] fix issue --- web_src/js/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index cab488167..8fe201192 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1214,7 +1214,7 @@ async function initRepository() { files: $attachments }, (data) => { - if (data.length === 0) { + if (data.length === 0 || data.content === '') { $renderContent.html($('#no-content').html()); } else { $renderContent.html(data.content); @@ -1225,7 +1225,7 @@ async function initRepository() { let imageShow = '' const $content = $segment.parent(); if (!$content.find('.ui.small.images').length) { - if (data.attachments !== '') { + if (data.attachments !== '' && data.attachments) { if ($content.find('.ui.middle.aligned').length === 0) { imageShow += '
' imageShow += '
' From f5d40b3f92f3455699084d86a200d185f0c87ea6 Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 14 Jun 2022 15:58:01 +0800 Subject: [PATCH 3/6] fix-2151 --- options/locale/locale_zh-CN.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 440f6746a..9ba722409 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1194,7 +1194,7 @@ template.topics=主题 template.avatar=头像 template.issue_labels=任务标签 template.one_item=必须至少选择一个模板项 -template.one_promise=创建项目需承诺使用协议！ +template.one_promise=创建项目时需承诺遵守使用协议 template.invalid=必须选择一个模板项目 template.repo_adress=项目地址 template.repo_path=项目地址 From 8a9a2fa3b448e9c2f07eb4cbf33c6271a785495a Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Tue, 14 Jun 2022 16:27:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/dataset.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 9d7f4a4d7..05a89964f 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -173,7 +173,7 @@ func DatasetIndex(ctx *context.Context) { uploader, _ := models.GetUserByID(attachment.UploaderID) attachment.Uploader = uploader if !strings.HasSuffix(attachment.Name, ".zip") { - attachment.DecompressState = 3 //非zip文件 + attachment.DecompressState = -1 //非zip文件 } } From a244126537b8bc6da2d2c0a6589dcd12d7300776 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 16:33:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=A7=A3=E5=8E=8B=E7=8A=B6=E6=80=81=E4=B8=BA0?= =?UTF-8?q?=E6=88=96=E8=80=852?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/datasets/index.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 9a8f2aaea..178253199 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -279,7 +279,7 @@
- {{if ne .DecompressState 3}}{{$.i18n.Tr "dataset.unzip_status"}}：{{if eq .DecompressState 1}}{{$.i18n.Tr "dataset.unzip_successed"}}{{else if eq .DecompressState 0}}{{$.i18n.Tr "dataset.unzip_stared"}}{{else}}{{$.i18n.Tr "dataset.unzip_failed"}}{{end}} + {{if ne .DecompressState -1}}{{$.i18n.Tr "dataset.unzip_status"}}：{{if eq .DecompressState 1}}{{$.i18n.Tr "dataset.unzip_successed"}}{{else if eq .DecompressState 0 2}}{{$.i18n.Tr "dataset.unzip_stared"}}{{else}}{{$.i18n.Tr "dataset.unzip_failed"}}{{end}}   {{end}}{{$.i18n.Tr "dataset.download"}}：{{.DownloadCount}} {{if .Description}}  {{$.i18n.Tr "dataset.description"}}：{{.Description}}{{end}} @@ -288,10 +288,10 @@ {{if eq .DecompressState 1}} - {{else if eq .DecompressState 0}} + {{else if eq .DecompressState 0 2}} - {{else if eq .DecompressState 2}} + {{else if eq .DecompressState 3}} {{else}} From 70c25399ae6df0d8511a8b93b948ec085fef09d1 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 16:39:29 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BD=BF=E7=94=A8=E5=8D=8F=E8=AE=AE=E6=96=B0?= =?UTF-8?q?=E5=BC=80=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/create.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 6b9e5c877..773f398f2 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -155,7 +155,8 @@ {{.i18n.Tr "repo.openi_use_agreement"}} + {{.i18n.Tr "repo.openi_use_agreement"}}