From 5cfdc207da6ee1ec11c93dc26ec2010fee638aa8 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Wed, 3 Aug 2022 14:25:47 +0200 Subject: [PATCH 1/7] Add option to create new issue from /issues page --- routers/web/user/home.go | 6 ++++++ templates/user/dashboard/issues.tmpl | 1 + templates/user/dashboard/issues_create.tmpl | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 templates/user/dashboard/issues_create.tmpl diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 648269980472e..07030bb36ac39 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -618,6 +618,12 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { shownIssues += int(issueCountByRepo[repoID]) } } + if len(repoIDs) == 1 { + var repo = showReposMap[repoIDs[0]] + if repo != nil { + ctx.Data["Repo"] = repo.OwnerName + "/" + repo.Name + } + } ctx.Data["IsShowClosed"] = isShowClosed diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index b2f4863d6c926..3f8e42753a622 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -99,6 +99,7 @@ {{.locale.Tr "repo.issues.filter_sort.farduedate"}} + {{template "user/dashboard/issues_create" .}} {{template "shared/issuelist" mergeinto . "listType" "dashboard"}} diff --git a/templates/user/dashboard/issues_create.tmpl b/templates/user/dashboard/issues_create.tmpl new file mode 100644 index 0000000000000..08d5af167de38 --- /dev/null +++ b/templates/user/dashboard/issues_create.tmpl @@ -0,0 +1,3 @@ +{{if .Repo}} + {{.locale.Tr "repo.issues.new"}} +{{end}} \ No newline at end of file From 5bbe2a1f1fe772a85ef1fa6cb510ce9ed5931ed2 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Wed, 3 Aug 2022 14:52:52 +0200 Subject: [PATCH 2/7] Fix formatting --- routers/web/user/home.go | 2 +- templates/user/dashboard/issues_create.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 07030bb36ac39..a93b26800bc43 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -619,7 +619,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { } } if len(repoIDs) == 1 { - var repo = showReposMap[repoIDs[0]] + repo := showReposMap[repoIDs[0]] if repo != nil { ctx.Data["Repo"] = repo.OwnerName + "/" + repo.Name } diff --git a/templates/user/dashboard/issues_create.tmpl b/templates/user/dashboard/issues_create.tmpl index 08d5af167de38..b1d083b13bf22 100644 --- a/templates/user/dashboard/issues_create.tmpl +++ b/templates/user/dashboard/issues_create.tmpl @@ -1,3 +1,3 @@ {{if .Repo}} {{.locale.Tr "repo.issues.new"}} -{{end}} \ No newline at end of file +{{end}} From 4137a6df0e2d261c98b020493e909c82c1636faf Mon Sep 17 00:00:00 2001 From: CodeDoctor <20452814+CodeDoctorDE@users.noreply.github.com> Date: Tue, 9 Aug 2022 06:13:30 +0200 Subject: [PATCH 3/7] Put everything in the same file, remove template --- templates/user/dashboard/issues.tmpl | 4 +++- templates/user/dashboard/issues_create.tmpl | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 templates/user/dashboard/issues_create.tmpl diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 3f8e42753a622..6a9cac02a95c1 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -99,7 +99,9 @@ {{.locale.Tr "repo.issues.filter_sort.farduedate"}} - {{template "user/dashboard/issues_create" .}} + {{if .Repo}} + {{.locale.Tr "repo.issues.new"}} + {{end}} {{template "shared/issuelist" mergeinto . "listType" "dashboard"}} diff --git a/templates/user/dashboard/issues_create.tmpl b/templates/user/dashboard/issues_create.tmpl deleted file mode 100644 index b1d083b13bf22..0000000000000 --- a/templates/user/dashboard/issues_create.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -{{if .Repo}} - {{.locale.Tr "repo.issues.new"}} -{{end}} From af529b2e79b431939b06397ebb3cbcaf55e64a4e Mon Sep 17 00:00:00 2001 From: CodeDoctor <20452814+CodeDoctorDE@users.noreply.github.com> Date: Tue, 9 Aug 2022 06:29:53 +0200 Subject: [PATCH 4/7] Simplify repo link, change to SingleRepoLink --- routers/web/user/home.go | 2 +- templates/user/dashboard/issues.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/user/home.go b/routers/web/user/home.go index a93b26800bc43..f338c525b4d3e 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -621,7 +621,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { if len(repoIDs) == 1 { repo := showReposMap[repoIDs[0]] if repo != nil { - ctx.Data["Repo"] = repo.OwnerName + "/" + repo.Name + ctx.Data["SingleRepoLink"] = repo.Link() } } diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 6a9cac02a95c1..12fc359e028fd 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -100,7 +100,7 @@ {{if .Repo}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{end}} From ba1d38598095471ec836d9632797a93987522c39 Mon Sep 17 00:00:00 2001 From: CodeDoctor <20452814+CodeDoctorDE@users.noreply.github.com> Date: Tue, 9 Aug 2022 06:31:56 +0200 Subject: [PATCH 5/7] Update templates/user/dashboard/issues.tmpl Co-authored-by: Gusted --- templates/user/dashboard/issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 12fc359e028fd..7b1fdae6caaaf 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -100,7 +100,7 @@ {{if .Repo}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{end}} From d6f27ae5f7256b0f49d81a732514cd4404e1cf9e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 9 Aug 2022 12:33:09 +0800 Subject: [PATCH 6/7] Update templates/user/dashboard/issues.tmpl --- templates/user/dashboard/issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 7b1fdae6caaaf..9c4551ee695d1 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -100,7 +100,7 @@ {{if .Repo}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{end}} From 43ca4c71f6881722d123ce44013ba88808f64313 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 9 Aug 2022 12:34:47 +0800 Subject: [PATCH 7/7] Update templates/user/dashboard/issues.tmpl --- templates/user/dashboard/issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 9c4551ee695d1..b6dc002154b67 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -99,7 +99,7 @@ {{.locale.Tr "repo.issues.filter_sort.farduedate"}} - {{if .Repo}} + {{if .SingleRepoLink}} {{.locale.Tr "repo.issues.new"}} {{end}}