Skip to content

Fix internal sever error when visiting a PR that bound to the deleted team #24127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 19, 2023
Merged

Fix internal sever error when visiting a PR that bound to the deleted team #24127

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99fc8d2
record team name in the content when creating request team review com…
sillyguodong Apr 14, 2023
fdb1516
just display ghost team
sillyguodong Apr 14, 2023
a4de58c
batch delete the binding relationship between team and PR
sillyguodong Apr 14, 2023
b6376b7
Merge branch 'main' into bugfix/issue_23738
sillyguodong Apr 16, 2023
3763d3a
Merge branch 'main' into bugfix/issue_23738
silverwind Apr 19, 2023
ae917fb
Merge branch 'main' into bugfix/issue_23738
GiteaBot Apr 19, 2023
d076235
Merge branch 'main' into bugfix/issue_23738
GiteaBot Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions templates/repo/issue/view_content/comments.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,10 +688,15 @@
{{$.locale.Tr "repo.issues.review.add_review_request" (.Assignee.GetDisplayName|Escape) $createdStr | Safe}}
{{end}}
{{else}}
<!-- If the assigned team is deleted, just displaying "Ghost Team" in the comment -->
{{$teamName := "Ghost Team"}}
{{if .AssigneeTeam}}
{{$teamName = .AssigneeTeam.Name}}
{{end}}
{{if .RemovedAssignee}}
{{$.locale.Tr "repo.issues.review.remove_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
{{$.locale.Tr "repo.issues.review.remove_review_request" ($teamName|Escape) $createdStr | Safe}}
{{else}}
{{$.locale.Tr "repo.issues.review.add_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
{{$.locale.Tr "repo.issues.review.add_review_request" ($teamName|Escape) $createdStr | Safe}}
{{end}}
{{end}}
</span>
Expand Down