From 4137651a94f0028919b45f6588043c03f2103d81 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 4 Apr 2023 15:17:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#3923=20=E6=B7=BB=E5=8A=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/grampus.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index 3d8355f556..b92dc1a1e6 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -1567,6 +1567,7 @@ func GrampusTrainJobShow(ctx *context.Context) { ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, task.DatasetName, false) ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) ctx.Data["displayJobName"] = task.DisplayJobName + ctx.Data["canReschedule"] = cloudbrain.CanDeleteJob(ctx, task) ctx.Data["ai_center"] = cloudbrainService.GetAiCenterShow(task.AiCenter, ctx) -- 2.34.1 From 81a0f2cc7ea4475de893fe86d8f68c037ba2e01b Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 4 Apr 2023 15:24:44 +0800 Subject: [PATCH 2/2] fix issue --- templates/repo/grampus/trainjob/show.tmpl | 3 ++- web_src/js/features/cloudbrainShow.js | 25 ++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 3770f22919..48c8439ea3 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -94,7 +94,7 @@ {{if eq .ComputeResource "CPU/GPU"}} {{$.i18n.Tr "repo.cloudbrain.runinfo"}} {{end}} - {{$.i18n.Tr "repo.model_download"}} + {{$.i18n.Tr "repo.model_download"}}
@@ -587,6 +587,7 @@ }); $('td.ti-text-form-content.spec').text(specStr); })(); + console.log({{.version_list_task}}) var setting = { check: { enable: true, diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js index ebb032e5e3..9b6d4cdec8 100644 --- a/web_src/js/features/cloudbrainShow.js +++ b/web_src/js/features/cloudbrainShow.js @@ -575,6 +575,7 @@ export default async function initCloudrainSow() { let init = $(this).data("init") || ""; let path = $(this).data("path"); let retryPath = `/api/v1/repos${$(this).data("retry-path")}`; + const rescheduleFlag = $(this).data("can-reschedule") || ""; $(`#dir_list${version_name}`).empty(); let url = `/api/v1/repos${path}?version_name=${version_name}&parentDir=${parents}`; $.get(url, (data) => { @@ -631,13 +632,23 @@ export default async function initCloudrainSow() {
`); } else if (data.StatusOK == 2) { // 失败 2 $(`#file_breadcrumb${version_name}`).empty(); - $(`#dir_list${version_name}`).html(`
-
- -
- ${i18n['file_sync_fail']} - ${i18n['retrieve_results']} -
`); + if (rescheduleFlag) { + $(`#dir_list${version_name}`).html(`
+
+ +
+ ${i18n['file_sync_fail']} + ${i18n['retrieve_results']} +
`); + } + else { + $(`#dir_list${version_name}`).html(`
+
+ +
+ ${i18n['file_sync_fail']} +
`); + } } else if (data.StatusOK == 3) { // 等待同步 3 $(`#file_breadcrumb${version_name}`).empty(); $(`#dir_list${version_name}`).html(`
-- 2.34.1