From d1da4f69e095fcaec4c904b2060f9db1c29d3318 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 23 Feb 2022 18:07:47 +0800 Subject: [PATCH 1/5] fix issue --- web_src/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 1abf3ba38..785dbde77 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3618,7 +3618,7 @@ function initVueApp() { if (!window.location.search) { window.location.href = this.localHref + '?page='+val } else if (searchParams.has('page')) { - window.location.href = this.localHref.replace(/page=[0-9]/g,'page='+val) + window.location.href = this.localHref.replace(/page=[0-9]+/g,'page='+val) } else { window.location.href=location.href+'&page='+val } From 2302580376df2fbf085776fe127e4e5fe2b47788 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 24 Feb 2022 10:36:26 +0800 Subject: [PATCH 2/5] fix issue --- templates/admin/cloudbrain/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index d1fe64f1b..1742fd8c4 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -65,7 +65,7 @@
{{if eq .JobType "DEBUG"}} - + {{.JobName}} {{else if eq .JobType "INFERENCE"}} From 381482349b00cfb561a6542f999aca07814f4ecf Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 24 Feb 2022 10:38:51 +0800 Subject: [PATCH 3/5] fix issue --- templates/admin/cloudbrain/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 1742fd8c4..f754025c5 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -65,7 +65,7 @@
{{if eq .JobType "DEBUG"}} - + {{.JobName}} {{else if eq .JobType "INFERENCE"}} From 8ebe85af495fdbdfb50637a651f09a3f6bd520b8 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Thu, 24 Feb 2022 10:44:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B8=8E=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/admin/cloudbrains.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go index cdcc724fe..ee89a5fa4 100644 --- a/routers/admin/cloudbrains.go +++ b/routers/admin/cloudbrains.go @@ -21,7 +21,7 @@ import ( const ( tplCloudBrains base.TplName = "admin/cloudbrain/list" EXCEL_DATE_FORMAT = "20060102150405" - CREATE_TIME_FORMAT = "2006/01/02 15:04:05.00" + CREATE_TIME_FORMAT = "2006/01/02 15:04:05" ) func CloudBrains(ctx *context.Context) { @@ -179,7 +179,7 @@ func DownloadCloudBrains(ctx *context.Context) { } func allValues(row int, rs *models.CloudbrainInfo, ctx *context.Context) map[string]string { - return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.Status, getCellName("C", row): rs.JobType, getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getDurationTime(rs), + return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.JobType, getCellName("C", row): rs.Status, getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getDurationTime(rs), getCellName("F", row): rs.ComputeResource, getCellName("G", row): rs.Name, getCellName("H", row): getRepoPathName(rs), getCellName("I", row): rs.JobName, } } @@ -216,7 +216,7 @@ func getTotalPage(total int64, pageSize int) int { func allHeader(ctx *context.Context) map[string]string { - return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.modelarts.status"), "C1": ctx.Tr("repo.cloudbrain_task_type"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")} + return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.cloudbrain_task_type"), "C1": ctx.Tr("repo.modelarts.status"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")} } From 595cd74b87223e2dc0e52e0b452cfa4665eb33c7 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 24 Feb 2022 11:57:59 +0800 Subject: [PATCH 5/5] fix issue --- templates/admin/cloudbrain/list.tmpl | 2 ++ templates/repo/issue/new_form.tmpl | 34 --------------------- templates/repo/issue/view_content/pull.tmpl | 6 ++-- 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index f754025c5..a50f667a8 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -60,6 +60,7 @@
{{range .Tasks}} + {{if .Repo}}
@@ -163,6 +164,7 @@
{{end}} + {{end}}
- - {{if .PageIsComparePull}} {{end}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 6e38a6f75..06f838322 100755 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -448,8 +448,8 @@
- - --> \ No newline at end of file