forked from gitea/gitea
1
0
Fork 0
gitea/templates
sillyguodong e8e871b44e
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
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)

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-03-07 18:47:23 +08:00
..
admin Fix missed `.hide` class (#23208) (#23237) 2023-03-02 11:45:42 -06:00
api/packages/pypi Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
base Fix various bugs for "install" page (#23194) (#23286) 2023-03-05 11:59:58 +01:00
code Remove Fomantic-UI's `.hidden` CSS class for menu elements (#22895) 2023-02-14 19:53:54 +08:00
custom Add footer extra links template (#9576) 2020-01-03 20:41:56 +02:00
explore Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
mail Revert relative links to absolute links in mail templates (#23267) (#23269) 2023-03-03 17:41:00 +00:00
org Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336) 2023-03-06 13:48:04 -06:00
package Fix nil context in RenderMarkdownToHtml (#23092) (#23108) 2023-02-24 21:17:03 +08:00
projects Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336) 2023-03-06 13:48:04 -06:00
repo Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324) 2023-03-07 18:47:23 +08:00
shared Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336) 2023-03-06 13:48:04 -06:00
status Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
swagger Add scopes to API to create token and display them (#22989) 2023-02-20 15:28:44 -06:00
user Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336) 2023-03-06 13:48:04 -06:00
home.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
install.tmpl Refactor hiding-methods, remove jQuery show/hide, remove `.hide` class, remove inline style=display:none (#22950) 2023-02-19 12:06:14 +08:00
post-install.tmpl Fix various bugs for "install" page (#23194) (#23286) 2023-03-05 11:59:58 +01:00