mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 19:38:23 +00:00 
			
		
		
		
	add request review from specific reviewers feature in pull request (#10756)
* add request review feature in pull request add a way to notify specific reviewers to review like github , by add or delet a special type review . The acton is is similar to Assign , so many code reuse the function and items of Assignee, but the meaning and result is different. The Permission style is is similar to github, that only writer can add a review request from Reviewers, but the poster can recall and remove a review request after a reviwer has revied even if he don't have Write Premission. only manager , the poster and reviewer of a request review can remove it. The reviewers can be requested to review contain all readers for private repo , for public, contain all writers and watchers. The offical Review Request will block merge if Reject can block it. an other change: add ui otify for Assignees. Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: Lauris BH <lauris@nix.lv> Signed-off-by: a1012112796 <1012112796@qq.com> * new change * add placeholder string * do some changes follow #10238 to add review requests num on lists also change icon for review requests to eye Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
		| @@ -24,6 +24,7 @@ type Notifier interface { | ||||
| 	NotifyIssueChangeStatus(*models.User, *models.Issue, *models.Comment, bool) | ||||
| 	NotifyIssueChangeMilestone(doer *models.User, issue *models.Issue, oldMilestoneID int64) | ||||
| 	NotifyIssueChangeAssignee(doer *models.User, issue *models.Issue, assignee *models.User, removed bool, comment *models.Comment) | ||||
| 	NotifyPullRewiewRequest(doer *models.User, issue *models.Issue, reviewer *models.User, isRequest bool, comment *models.Comment) | ||||
| 	NotifyIssueChangeContent(doer *models.User, issue *models.Issue, oldContent string) | ||||
| 	NotifyIssueClearLabels(doer *models.User, issue *models.Issue) | ||||
| 	NotifyIssueChangeTitle(doer *models.User, issue *models.Issue, oldTitle string) | ||||
|   | ||||
| @@ -86,6 +86,10 @@ func (*NullNotifier) NotifyIssueChangeContent(doer *models.User, issue *models.I | ||||
| func (*NullNotifier) NotifyIssueChangeAssignee(doer *models.User, issue *models.Issue, assignee *models.User, removed bool, comment *models.Comment) { | ||||
| } | ||||
|  | ||||
| // NotifyPullRewiewRequest places a place holder function | ||||
| func (*NullNotifier) NotifyPullRewiewRequest(doer *models.User, issue *models.Issue, reviewer *models.User, isRequest bool, comment *models.Comment) { | ||||
| } | ||||
|  | ||||
| // NotifyIssueClearLabels places a place holder function | ||||
| func (*NullNotifier) NotifyIssueClearLabels(doer *models.User, issue *models.Issue) { | ||||
| } | ||||
|   | ||||
| @@ -100,6 +100,13 @@ func (m *mailNotifier) NotifyIssueChangeAssignee(doer *models.User, issue *model | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (m *mailNotifier) NotifyPullRewiewRequest(doer *models.User, issue *models.Issue, reviewer *models.User, isRequest bool, comment *models.Comment) { | ||||
| 	if isRequest && doer.ID != reviewer.ID && reviewer.EmailNotifications() == models.EmailNotificationsEnabled { | ||||
| 		ct := fmt.Sprintf("Requested to review #%d.", issue.Index) | ||||
| 		mailer.SendIssueAssignedMail(issue, doer, ct, comment, []string{reviewer.Email}) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (m *mailNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) { | ||||
| 	if err := pr.LoadIssue(); err != nil { | ||||
| 		log.Error("pr.LoadIssue: %v", err) | ||||
|   | ||||
| @@ -150,6 +150,13 @@ func NotifyIssueChangeAssignee(doer *models.User, issue *models.Issue, assignee | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // NotifyPullRewiewRequest notifies Request Review change | ||||
| func NotifyPullRewiewRequest(doer *models.User, issue *models.Issue, reviewer *models.User, isRequest bool, comment *models.Comment) { | ||||
| 	for _, notifier := range notifiers { | ||||
| 		notifier.NotifyPullRewiewRequest(doer, issue, reviewer, isRequest, comment) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // NotifyIssueClearLabels notifies clear labels to notifiers | ||||
| func NotifyIssueClearLabels(doer *models.User, issue *models.Issue) { | ||||
| 	for _, notifier := range notifiers { | ||||
|   | ||||
| @@ -22,6 +22,7 @@ type ( | ||||
| 		IssueID              int64 | ||||
| 		CommentID            int64 | ||||
| 		NotificationAuthorID int64 | ||||
| 		ReceiverID           int64 // 0 -- ALL Watcher | ||||
| 	} | ||||
| ) | ||||
|  | ||||
| @@ -39,7 +40,7 @@ func NewNotifier() base.Notifier { | ||||
| func (ns *notificationService) handle(data ...queue.Data) { | ||||
| 	for _, datum := range data { | ||||
| 		opts := datum.(issueNotificationOpts) | ||||
| 		if err := models.CreateOrUpdateIssueNotifications(opts.IssueID, opts.CommentID, opts.NotificationAuthorID); err != nil { | ||||
| 		if err := models.CreateOrUpdateIssueNotifications(opts.IssueID, opts.CommentID, opts.NotificationAuthorID, opts.ReceiverID); err != nil { | ||||
| 			log.Error("Was unable to create issue notification: %v", err) | ||||
| 		} | ||||
| 	} | ||||
| @@ -103,3 +104,35 @@ func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r | ||||
| 	} | ||||
| 	_ = ns.issueQueue.Push(opts) | ||||
| } | ||||
|  | ||||
| func (ns *notificationService) NotifyIssueChangeAssignee(doer *models.User, issue *models.Issue, assignee *models.User, removed bool, comment *models.Comment) { | ||||
| 	if !removed { | ||||
| 		var opts = issueNotificationOpts{ | ||||
| 			IssueID:              issue.ID, | ||||
| 			NotificationAuthorID: doer.ID, | ||||
| 			ReceiverID:           assignee.ID, | ||||
| 		} | ||||
|  | ||||
| 		if comment != nil { | ||||
| 			opts.CommentID = comment.ID | ||||
| 		} | ||||
|  | ||||
| 		_ = ns.issueQueue.Push(opts) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (ns *notificationService) NotifyPullRewiewRequest(doer *models.User, issue *models.Issue, reviewer *models.User, isRequest bool, comment *models.Comment) { | ||||
| 	if isRequest { | ||||
| 		var opts = issueNotificationOpts{ | ||||
| 			IssueID:              issue.ID, | ||||
| 			NotificationAuthorID: doer.ID, | ||||
| 			ReceiverID:           reviewer.ID, | ||||
| 		} | ||||
|  | ||||
| 		if comment != nil { | ||||
| 			opts.CommentID = comment.ID | ||||
| 		} | ||||
|  | ||||
| 		_ = ns.issueQueue.Push(opts) | ||||
| 	} | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user