egtyl/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix incorrect role labels for migrated issues and comments (#22914) (#22923)

Browse source 
Backport #22914

Fix #22797.

## Reason
If a comment was migrated from other platforms, this comment may have an
original author and its poster is always not the original author. When
the `roleDescriptor` func get the poster's role descriptor for a
comment, it does not check if the comment has an original author. So the
migrated comments' original authors might be marked as incorrect roles.

Co-authored-by: Zettat123 <zettat123@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Yarden Shoham 2023-02-16 05:19:46 +02:00 committed by GitHub
parent e4238583db
commit 9e68261ca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
models/issues/comment.go
View file

@ -1549,3 +1549,8 @@ func FixCommentTypeLabelWithOutsideLabels() (int64, error) {
return res.RowsAffected() return res.RowsAffected()
} }
// HasOriginalAuthor returns if a comment was migrated and has an original author.
func (c *Comment) HasOriginalAuthor() bool {
return c.OriginalAuthor != "" && c.OriginalAuthorID != 0
}

5
models/issues/issue.go
View file

@ -2466,3 +2466,8 @@ func DeleteOrphanedIssues() error {
} }
return nil return nil
} }
// HasOriginalAuthor returns if an issue was migrated and has an original author.
func (issue *Issue) HasOriginalAuthor() bool {
return issue.OriginalAuthor != "" && issue.OriginalAuthorID != 0
}

12
routers/web/repo/issue.go
View file

@ -1118,7 +1118,11 @@ func NewIssuePost(ctx *context.Context) {
} }
// roleDescriptor returns the Role Descriptor for a comment in/with the given repo, poster and issue // roleDescriptor returns the Role Descriptor for a comment in/with the given repo, poster and issue
func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *user_model.User, issue *issues_model.Issue) (issues_model.RoleDescriptor, error) { func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *user_model.User, issue *issues_model.Issue, hasOriginalAuthor bool) (issues_model.RoleDescriptor, error) {
if hasOriginalAuthor {
return issues_model.RoleDescriptorNone, nil
}
perm, err := access_model.GetUserRepoPermission(ctx, repo, poster) perm, err := access_model.GetUserRepoPermission(ctx, repo, poster)
if err != nil { if err != nil {
return issues_model.RoleDescriptorNone, err return issues_model.RoleDescriptorNone, err
@ -1420,7 +1424,7 @@ func ViewIssue(ctx *context.Context) {
// check if dependencies can be created across repositories // check if dependencies can be created across repositories
ctx.Data["AllowCrossRepositoryDependencies"] = setting.Service.AllowCrossRepositoryDependencies ctx.Data["AllowCrossRepositoryDependencies"] = setting.Service.AllowCrossRepositoryDependencies
if issue.ShowRole, err = roleDescriptor(ctx, repo, issue.Poster, issue); err != nil { if issue.ShowRole, err = roleDescriptor(ctx, repo, issue.Poster, issue, issue.HasOriginalAuthor()); err != nil {
ctx.ServerError("roleDescriptor", err) ctx.ServerError("roleDescriptor", err)
return return
} }
@ -1459,7 +1463,7 @@ func ViewIssue(ctx *context.Context) {
continue continue
} }
comment.ShowRole, err = roleDescriptor(ctx, repo, comment.Poster, issue) comment.ShowRole, err = roleDescriptor(ctx, repo, comment.Poster, issue, comment.HasOriginalAuthor())
if err != nil { if err != nil {
ctx.ServerError("roleDescriptor", err) ctx.ServerError("roleDescriptor", err)
return return
@ -1558,7 +1562,7 @@ func ViewIssue(ctx *context.Context) {
continue continue
} }
c.ShowRole, err = roleDescriptor(ctx, repo, c.Poster, issue) c.ShowRole, err = roleDescriptor(ctx, repo, c.Poster, issue, c.HasOriginalAuthor())
if err != nil { if err != nil {
ctx.ServerError("roleDescriptor", err) ctx.ServerError("roleDescriptor", err)
return return