mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity
forgejo/templates/repo
History
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
..
actions Remove unnecessary space on link (#23334) (#23340) 2023-03-06 16:35:51 -05:00
branch add margin top to the top of branches (#23002) 2023-02-21 13:03:44 +08:00
cite Copy citation file content, in APA and BibTex format, on repo home page (#19999) 2022-11-11 18:02:50 +01:00
diff Fix PR view misalignment caused by long name file (#23321) (#23335) 2023-03-07 11:11:55 +08:00
editor Fix broken code editor diff preview (#23307) (#23320) 2023-03-06 12:05:35 -06:00
find Refactor hiding-methods, remove jQuery show/hide, remove `.hide` class, remove inline style=display:none (#22950) 2023-02-19 12:06:14 +08:00
graph Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
issue Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324) 2023-03-07 18:47:23 +08:00
migrate Refactor hiding-methods, remove jQuery show/hide, remove `.hide` class, remove inline style=display:none (#22950) 2023-02-19 12:06:14 +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
pulls Always go full width in PR view (#22844) 2023-02-16 13:25:00 -06:00
release Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
settings Add context when rendering labels or emojis (#23281) (#23319) 2023-03-06 10:32:40 -06:00
wiki Refactor hiding-methods, remove jQuery show/hide, remove `.hide` class, remove inline style=display:none (#22950) 2023-02-19 12:06:14 +08:00
activity.tmpl Add context when rendering labels or emojis (#23281) (#23319) 2023-03-06 10:32:40 -06:00
blame.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
branch_dropdown.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
clone_buttons.tmpl Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
clone_script.tmpl Make clone URL use current page's host (#22808) 2023-02-09 17:29:13 +08:00
commit_page.tmpl Use `gt-relative` class instead of the ambiguous `gt-pr` class (#23008) 2023-02-20 19:16:56 -05:00
commit_status.tmpl Change commit status icons to SVG (#20736) 2022-08-09 23:55:29 +02:00
commit_statuses.tmpl Fix hidden commit status on multiple checks (#22889) 2023-02-20 16:43:04 +08:00
commits.tmpl Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
commits_list.tmpl Add context when rendering labels or emojis (#23281) (#23319) 2023-03-06 10:32:40 -06:00
commits_list_small.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
commits_table.tmpl Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
create.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
create_helper.tmpl Add templates to customize text when creating and migrating repositories 2023-01-24 22:36:48 -05:00
empty.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
file_info.tmpl Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
forks.tmpl Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
graph.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
header.tmpl Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
home.tmpl Improve PR Review Box UI (#22986) 2023-02-21 21:36:53 +08:00
icon.tmpl Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
packages.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
search.tmpl Remove Fomantic-UI's `.hidden` CSS class for menu elements (#22895) 2023-02-14 19:53:54 +08:00
shabox_badge.tmpl Fix shabox regression (#22924) 2023-02-16 09:37:11 +08:00
sub_menu.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
unicode_escape_prompt.tmpl Move helpers to be prefixed with `gt-` (#22879) 2023-02-13 17:59:59 +00:00
upload.tmpl Refactor `i18n` to `locale` (#20153) 2022-06-27 15:58:46 -05:00
user_cards.tmpl Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
view_file.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
view_list.tmpl Add wrapper to author to avoid long name ui problem (#23030) (#23098) 2023-02-24 10:45:18 +08:00
watchers.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00