Fix the display of project type for deleted projects (#31732) (#31734)

Backport #31732 by @yp05327

Fix: #31727
After:

![image](https://github.com/user-attachments/assets/1dfb4b31-3bd6-47f7-b126-650f33f453e2)

Co-authored-by: yp05327 <576951401@qq.com>

diff --git a/models/project/project.go b/models/project/project.go
index 8be38694c52238f7f01310d067910f09fd002ff5..0dcf3176678f3514dacfe598066b3bd95ec58bf0 100644 (file)
--- a/models/project/project.go
+++ b/models/project/project.go
@@ -109,6 +109,13 @@ type Project struct {
        ClosedDateUnix timeutil.TimeStamp
 }
 
+// Ghost Project is a project which has been deleted
+const GhostProjectID = -1
+
+func (p *Project) IsGhost() bool {
+       return p.ID == GhostProjectID
+}
+
 func (p *Project) LoadOwner(ctx context.Context) (err error) {
        if p.Owner != nil {
                return nil

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index f775764d233ab3248fb2e4e0e84e039e7ae117a3..c5e7289cbfeedc05961eb12b7209e8e6f604f2f1 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3675,6 +3675,7 @@ variables.update.failed = Failed to edit variable.
 variables.update.success = The variable has been edited.
 
 [projects]
+deleted.display_name = Deleted Project
 type-1.display_name = Individual Project
 type-2.display_name = Repository Project
 type-3.display_name = Organization Project

diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 6cfc22566ad70bb1e63b5af8a0d8655d633f803b..849fc83fb0f111328eb5f97a3359e33c3ff9504e 100644 (file)
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -1669,7 +1669,7 @@ func ViewIssue(ctx *context.Context) {
                        }
 
                        ghostProject := &project_model.Project{
-                               ID:    -1,
+                               ID:    project_model.GhostProjectID,
                                Title: ctx.Locale.TrString("repo.issues.deleted_project"),
                        }
 

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index acc04e4c61514716c30f3165f92d9e46a6acfb9c..cc7f325a4febd9a8553df0e0b1a67b29816f39d4 100644 (file)
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -582,13 +582,19 @@
                                        {{template "shared/user/authorlink" .Poster}}
                                        {{$oldProjectDisplayHtml := "Unknown Project"}}
                                        {{if .OldProject}}
-                                               {{$trKey := printf "projects.type-%d.display_name" .OldProject.Type}}
-                                               {{$oldProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` (ctx.Locale.Tr $trKey) .OldProject.Title}}
+                                               {{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
+                                               {{if not .OldProject.IsGhost}}
+                                                       {{$tooltip = ctx.Locale.Tr (printf "projects.type-%d.display_name" .OldProject.Type)}}
+                                               {{end}}
+                                               {{$oldProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .OldProject.Title}}
                                        {{end}}
                                        {{$newProjectDisplayHtml := "Unknown Project"}}
                                        {{if .Project}}
-                                               {{$trKey := printf "projects.type-%d.display_name" .Project.Type}}
-                                               {{$newProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` (ctx.Locale.Tr $trKey) .Project.Title}}
+                                               {{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
+                                               {{if not .Project.IsGhost}}
+                                                       {{$tooltip = ctx.Locale.Tr (printf "projects.type-%d.display_name" .Project.Type)}}
+                                               {{end}}
+                                               {{$newProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .Project.Title}}
                                        {{end}}
                                        {{if and (gt .OldProjectID 0) (gt .ProjectID 0)}}
                                                {{ctx.Locale.Tr "repo.issues.change_project_at" $oldProjectDisplayHtml $newProjectDisplayHtml $createdStr}}