From 3a375a1de34c6d03a2e8cc0169983f84d8cb10c6 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Fri, 8 Mar 2024 09:33:52 +0500 Subject: [PATCH 1/2] fix: don't hide projects from sidebar when they're disabled in repo --- .../repo/issue/view_content/sidebar.tmpl | 94 +++++++++---------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index f5b6751d6d..ff331f61f3 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -151,59 +151,57 @@ - {{if .IsProjectsEnabled}} -
+
-
- - {{ctx.Locale.Tr "repo.issues.new.projects"}} - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "gt-ml-2"}} - {{end}} - -
- {{if or .OpenProjects .ClosedProjects}} -
- {{svg "octicon-search" 16}} - -
- {{end}} -
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
- {{if .OpenProjects}} -
-
- {{ctx.Locale.Tr "repo.issues.new.open_projects"}} -
- {{range .OpenProjects}} - - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} - - {{end}} - {{end}} - {{if .ClosedProjects}} -
-
- {{ctx.Locale.Tr "repo.issues.new.closed_projects"}} -
- {{range .ClosedProjects}} - - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} - - {{end}} - {{end}} +
+ + {{ctx.Locale.Tr "repo.issues.new.projects"}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} + {{svg "octicon-gear" 16 "gt-ml-2"}} + {{end}} + +
+ {{if or .OpenProjects .ClosedProjects}} +
+ {{svg "octicon-search" 16}} +
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_projects"}} -
- {{if .Issue.Project}} - - {{svg .Issue.Project.IconName 18 "gt-mr-3"}}{{.Issue.Project.Title}} + {{end}} +
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
+ {{if .OpenProjects}} +
+
+ {{ctx.Locale.Tr "repo.issues.new.open_projects"}} +
+ {{range .OpenProjects}} + + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} {{end}} -
+ {{end}} + {{if .ClosedProjects}} +
+
+ {{ctx.Locale.Tr "repo.issues.new.closed_projects"}} +
+ {{range .ClosedProjects}} + + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} + + {{end}} + {{end}}
- {{end}} +
+
+ {{ctx.Locale.Tr "repo.issues.new.no_projects"}} +
+ {{if .Issue.Project}} + + {{svg .Issue.Project.IconName 18 "gt-mr-3"}}{{.Issue.Project.Title}} + + {{end}} +
+
From 9b214b362d8433f682819798dbc08c9bda6f3ef3 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Fri, 8 Mar 2024 09:43:27 +0500 Subject: [PATCH 2/2] fix: indicate there are no projects to choose from --- templates/repo/issue/view_content/sidebar.tmpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index ff331f61f3..c3168dd451 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -168,6 +168,11 @@
{{end}}
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
+ {{if and (not .OpenProjects) (not .ClosedProjects)}} +
+ {{ctx.Locale.Tr "repo.issues.new.no_items"}} +
+ {{end}} {{if .OpenProjects}}