mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	Less naked returns (#25713)
just a step towards #25655 and some related refactoring
This commit is contained in:
		| @@ -46,13 +46,12 @@ func DeleteNotPassedAssignee(ctx context.Context, issue *issues_model.Issue, doe | ||||
| func ToggleAssignee(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, assigneeID int64) (removed bool, comment *issues_model.Comment, err error) { | ||||
| 	removed, comment, err = issues_model.ToggleIssueAssignee(ctx, issue, doer, assigneeID) | ||||
| 	if err != nil { | ||||
| 		return | ||||
| 		return false, nil, err | ||||
| 	} | ||||
|  | ||||
| 	assignee, err1 := user_model.GetUserByID(ctx, assigneeID) | ||||
| 	if err1 != nil { | ||||
| 		err = err1 | ||||
| 		return | ||||
| 	assignee, err := user_model.GetUserByID(ctx, assigneeID) | ||||
| 	if err != nil { | ||||
| 		return false, nil, err | ||||
| 	} | ||||
|  | ||||
| 	notification.NotifyIssueChangeAssignee(ctx, doer, issue, assignee, removed, comment) | ||||
| @@ -236,23 +235,23 @@ func TeamReviewRequest(ctx context.Context, issue *issues_model.Issue, doer *use | ||||
| 	} | ||||
|  | ||||
| 	if err != nil { | ||||
| 		return | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	if comment == nil || !isAdd { | ||||
| 		return | ||||
| 		return nil, nil | ||||
| 	} | ||||
|  | ||||
| 	// notify all user in this team | ||||
| 	if err = comment.LoadIssue(ctx); err != nil { | ||||
| 		return | ||||
| 	if err := comment.LoadIssue(ctx); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	members, err := organization.GetTeamMembers(ctx, &organization.SearchMembersOptions{ | ||||
| 		TeamID: reviewer.ID, | ||||
| 	}) | ||||
| 	if err != nil { | ||||
| 		return | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	for _, member := range members { | ||||
|   | ||||
| @@ -49,17 +49,17 @@ func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *issues_mo | ||||
| } | ||||
|  | ||||
| // ChangeTitle changes the title of this issue, as the given user. | ||||
| func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, title string) (err error) { | ||||
| func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, title string) error { | ||||
| 	oldTitle := issue.Title | ||||
| 	issue.Title = title | ||||
|  | ||||
| 	if err = issues_model.ChangeIssueTitle(ctx, issue, doer, oldTitle); err != nil { | ||||
| 		return | ||||
| 	if err := issues_model.ChangeIssueTitle(ctx, issue, doer, oldTitle); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issues_model.HasWorkInProgressPrefix(title) { | ||||
| 		if err = issues_model.PullRequestCodeOwnersReview(ctx, issue, issue.PullRequest); err != nil { | ||||
| 			return | ||||
| 		if err := issues_model.PullRequestCodeOwnersReview(ctx, issue, issue.PullRequest); err != nil { | ||||
| 			return err | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -12,9 +12,9 @@ import ( | ||||
| ) | ||||
|  | ||||
| // ClearLabels clears all of an issue's labels | ||||
| func ClearLabels(issue *issues_model.Issue, doer *user_model.User) (err error) { | ||||
| 	if err = issues_model.ClearIssueLabels(issue, doer); err != nil { | ||||
| 		return | ||||
| func ClearLabels(issue *issues_model.Issue, doer *user_model.User) error { | ||||
| 	if err := issues_model.ClearIssueLabels(issue, doer); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	notification.NotifyIssueClearLabels(db.DefaultContext, doer, issue) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user