From b697d06f749c7e788c15eca4b947ca4ce9e91604 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 13 Dec 2021 16:18:03 +0800 Subject: [PATCH 1/4] #820 add PageIsIssueList=true --- routers/repo/milestone.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/repo/milestone.go b/routers/repo/milestone.go index e30e6371f..41f1f88bc 100644 --- a/routers/repo/milestone.go +++ b/routers/repo/milestone.go @@ -268,6 +268,7 @@ func MilestoneIssuesAndPulls(ctx *context.Context) { ctx.Data["CanWriteIssues"] = ctx.Repo.CanWriteIssuesOrPulls(false) ctx.Data["CanWritePulls"] = ctx.Repo.CanWriteIssuesOrPulls(true) + ctx.Data["PageIsIssueList"] = true ctx.HTML(200, tplMilestoneIssues) } From 5219c3a9a24ef9302958f0c9fe10708ccd5aa4f9 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 15 Dec 2021 11:55:30 +0800 Subject: [PATCH 2/4] fix-1051 --- templates/repo/home.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 34c3a3121..08bf3e825 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -337,7 +337,8 @@ {{end}}
From 6f68574bca6256e5c57f1ee6197eed7b242e317c Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 21 Dec 2021 08:40:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9commit=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/components/Contributors.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web_src/js/components/Contributors.vue b/web_src/js/components/Contributors.vue index 1384b4e49..cd85f6ae9 100644 --- a/web_src/js/components/Contributors.vue +++ b/web_src/js/components/Contributors.vue @@ -45,6 +45,8 @@ export default { data() { return { url:'', + url_infor:'', + href_:'', contributors_list:[], contributors_list_page:[], currentPage:1, @@ -56,7 +58,7 @@ export default { methods: { getContributorsList(){ - this.$axios.get(this.url+'/list').then((res)=>{ + this.$axios.get(this.url+'/list?'+this.url_infor).then((res)=>{ this.contributors_list = res.data.contributor_info this.totalNum = this.contributors_list.length this.contributors_list_page = this.contributors_list.slice(0,this.pageSize) @@ -78,6 +80,10 @@ created(){ this.url = url; let strIndex = this.url.indexOf("contributors") this.url_code = this.url.substr(0,strIndex) + + this.href_ = window.location.href; + let index = this.href_.indexOf("?") + this.url_infor = this.href_.substring(index+1,this.href_.length) this.getContributorsList() }, From 441ea3688d5bde6c0f05ec5e950b9403ba050e8c Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 22 Dec 2021 11:47:19 +0800 Subject: [PATCH 4/4] add del status --- routers/repo/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index d2a094bc8..1578e2f28 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -274,7 +274,7 @@ func NotebookDel(ctx *context.Context) { return } - if task.Status != string(models.JobStopped) { + if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped){ log.Error("the job(%s) has not been stopped", task.JobName) ctx.ServerError("the job has not been stopped", errors.New("the job has not been stopped")) return