This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.
forgejo/templates/repo
sillyguodong 3dc2724d36
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322)
Backport: #23189
Close: #22784

1. On GH, we can reopen a PR which was closed before after pushing
commits. After reopening PR, we can see the commits that were pushed
after closing PR in the time line. So the case of
[issue](https://github.com/go-gitea/gitea/issues/22784) is a bug which
needs to be fixed.

2. After closing a PR and pushing commits, `headBranchSha` is not equal
to `sha`(which is the last commit ID string of reference). If the
judgement exists, the button of reopen will not display. So, skip the
judgement if the status of PR is closed.


![image](https://user-images.githubusercontent.com/33891828/222037529-651fccf9-0bba-433e-b2f0-79c17e0cc812.png)

3. Even if PR is already close, we should still insert comment record
into DB when we push commits.
So we should still call  function `CreatePushPullComment()`.


067b0c2664/services/pull/pull.go (L260-L282)
So, I add a switch(`includeClosed`) to the
`GetUnmergedPullRequestsByHeadInfo` func to control whether the status
of PR must be open. In this case, by setting `includeClosed` to `true`,
we can query the closed PR.


![image](https://user-images.githubusercontent.com/33891828/222621045-bb80987c-10c5-4eac-aa0c-1fb9c6aefb51.png)

4. In the loop of comments, I use the`latestCloseCommentID` variable to
record the last occurrence of the close comment.
In the go template, if the status of PR is closed, the comments whose
type is `CommentTypePullRequestPush(29)` after `latestCloseCommentID`
won't be rendered.


![image](https://user-images.githubusercontent.com/33891828/222058913-c91cf3e3-819b-40c5-8015-654b31eeccff.png)
e.g.
1). The initial status of the PR is opened.


![image](https://user-images.githubusercontent.com/33891828/222453617-33c5093e-f712-4cd6-8489-9f87e2075869.png)
2). Then I click the button of `Close`. PR is closed now.


![image](https://user-images.githubusercontent.com/33891828/222453694-25c588a9-c121-4897-9ae5-0b13cf33d20b.png)
3). I try to push a commit to this PR, even though its current status is
closed.


![image](https://user-images.githubusercontent.com/33891828/222453916-361678fb-7321-410d-9e37-5a26e8095638.png)
But in comments list, this commit do not display.This is as expected :)


![image](https://user-images.githubusercontent.com/33891828/222454169-7617a791-78d2-404e-be5e-77d555f93313.png)
4). Click the `Reopen` button, the commit which is pushed after closing
PR display now.


![image](https://user-images.githubusercontent.com/33891828/222454533-897893b6-b96e-4701-b5cb-b1800f382b8f.png)
2023-03-06 11:38:45 -06:00
..
branch Fix button in branch list, avoid unexpected page jump before restore branch actually done (#21562) (#21928) 2022-11-25 00:02:33 +08:00
diff Use beforeCommit instead of baseCommit (#22949) (#22996) 2023-02-21 10:51:02 -05:00
editor Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
find Refactor `i18n` to `locale` (#20153) 2022-06-27 15:58:46 -05:00
graph Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
issue Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322) 2023-03-06 11:38:45 -06:00
migrate Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
projects Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
pulls fix: PR status layout on mobile (#21547) (#22441) 2023-01-14 16:56:44 +08:00
release Tag list should include draft releases with existing tags (#21263) 2022-10-03 20:05:53 +08:00
settings Fix 404 error viewing the LFS file (#22945) (#22948) 2023-02-17 15:22:05 +08:00
wiki Webhook for Wiki changes (#20219) 2022-09-04 20:54:23 +01:00
activity.tmpl Respect user's locale when rendering the date range in the repo activity page (#21410) 2022-10-13 00:14:14 +03:00
blame.tmpl Switch Unicode Escaping to a VSCode-like system (#19990) 2022-08-13 19:32:34 +01:00
branch_dropdown.tmpl Fix branch dropdown shifting on page load (#21428) 2022-10-19 13:39:55 +08:00
clone_buttons.tmpl Rework repo buttons (#20602) 2022-08-08 02:15:11 +03:00
clone_script.tmpl Make the vscode clone link respect transport protocol (#20557) 2022-09-09 02:38:51 -04:00
commit_page.tmpl Remove duplicate "Actions" label in mobile view (#21974) (#22439) 2023-01-13 23:23:39 +00:00
commit_status.tmpl Change commit status icons to SVG (#20736) 2022-08-09 23:55:29 +02:00
commit_statuses.tmpl Improve commit status icons (#21124) 2022-09-09 17:03:18 -04:00
commits.tmpl Rework repo buttons (#20602) 2022-08-08 02:15:11 +03:00
commits_list.tmpl Change `commits-table` column width (#21564) 2022-10-25 18:00:37 +01:00
commits_list_small.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
commits_table.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
create.tmpl Remove cancel button in repo creation page (#21381) 2022-10-11 22:47:35 +08:00
empty.tmpl Add default value for clone URLs (#20600) 2022-08-02 10:52:05 +08:00
forks.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
graph.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
header.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
home.tmpl Expand "Go to File" button again, fix 'Add File' margin (#21543) 2022-10-24 02:23:04 +01:00
icon.tmpl Do not display org avatar near icon for internal repos (#13957) 2020-12-13 16:51:15 -05:00
packages.tmpl Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
search.tmpl Add user/organization code search (#19977) 2022-10-11 00:12:03 +01:00
shabox_badge.tmpl Refactor `i18n` to `locale` (#20153) 2022-06-27 15:58:46 -05:00
sub_menu.tmpl Fix #21406: Hide repo information from file view/blame mode (#21420) 2022-10-13 11:31:10 +03:00
unicode_escape_prompt.tmpl Switch Unicode Escaping to a VSCode-like system (#19990) 2022-08-13 19:32:34 +01:00
upload.tmpl Refactor `i18n` to `locale` (#20153) 2022-06-27 15:58:46 -05:00
user_cards.tmpl Localize all timestamps (#21440) 2022-10-17 12:08:21 +08:00
view_file.tmpl Ensure that plain files are rendered correctly even when containing ambiguous characters (#22017) (#22160) 2022-12-19 23:51:21 +08:00
view_list.tmpl Add wrapper to author to avoid long name ui problem (#23030) (#23172) 2023-02-27 22:47:04 +08:00
watchers.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00