mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

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

Fix: #31727
After:

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

(cherry picked from commit 75d0b61546e00390afdd850149de525dd64336a5)

Conflicts:
	options/locale/locale_en-US.ini
  trivial conflict & fix excessive uppercase to unify with the other translations
This commit is contained in:
yp05327 2024-07-30 13:37:43 +09:00 committed by Earl Warren
parent 49eb831663
commit c784a58740
No known key found for this signature in database
GPG Key ID: 0579CB2928A78A00
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/project/project.go
View File

@ -103,6 +103,13 @@ type Project struct {
ClosedDateUnix timeutil.TimeStamp 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) { func (p *Project) LoadOwner(ctx context.Context) (err error) {
if p.Owner != nil { if p.Owner != nil {
return nil return nil

1
options/locale/locale_en-US.ini
View File

@ -3860,6 +3860,7 @@ variables.update.failed = Failed to edit variable.
variables.update.success = The variable has been edited. variables.update.success = The variable has been edited.
[projects] [projects]
deleted.display_name = Deleted Project
type-1.display_name = Individual project type-1.display_name = Individual project
type-2.display_name = Repository project type-2.display_name = Repository project
type-3.display_name = Organization project type-3.display_name = Organization project

2
routers/web/repo/issue.go
View File

@ -1697,7 +1697,7 @@ func ViewIssue(ctx *context.Context) {
} }
ghostProject := &project_model.Project{ ghostProject := &project_model.Project{
ID: -1, ID: project_model.GhostProjectID,
Title: ctx.Locale.TrString("repo.issues.deleted_project"), Title: ctx.Locale.TrString("repo.issues.deleted_project"),
} }

14
templates/repo/issue/view_content/comments.tmpl
View File

@ -582,13 +582,19 @@
{{template "shared/user/authorlink" .Poster}} {{template "shared/user/authorlink" .Poster}}
{{$oldProjectDisplayHtml := "Unknown Project"}} {{$oldProjectDisplayHtml := "Unknown Project"}}
{{if .OldProject}} {{if .OldProject}}
{{$trKey := printf "projects.type-%d.display_name" .OldProject.Type}} {{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
{{$oldProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` (ctx.Locale.Tr $trKey) .OldProject.Title}} {{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}} {{end}}
{{$newProjectDisplayHtml := "Unknown Project"}} {{$newProjectDisplayHtml := "Unknown Project"}}
{{if .Project}} {{if .Project}}
{{$trKey := printf "projects.type-%d.display_name" .Project.Type}} {{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
{{$newProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` (ctx.Locale.Tr $trKey) .Project.Title}} {{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}} {{end}}
{{if and (gt .OldProjectID 0) (gt .ProjectID 0)}} {{if and (gt .OldProjectID 0) (gt .ProjectID 0)}}
{{ctx.Locale.Tr "repo.issues.change_project_at" $oldProjectDisplayHtml $newProjectDisplayHtml $createdStr}} {{ctx.Locale.Tr "repo.issues.change_project_at" $oldProjectDisplayHtml $newProjectDisplayHtml $createdStr}}