simplify logic

fix logic
fix a small bug about original author

Author: a1012112796

routers/repo/issue.go

@@ -980,6 +980,10 @@ func commentTag(repo *models.Repository, poster *models.User, issue *models.Issu
 		return models.CommentTagNone, err
 	}
 	if perm.IsOwner() {
+		if !poster.IsAdmin {
+			return models.CommentTagOwner, nil
+		}
+
 		ok, err := models.IsUserRealRepoAdmin(repo, poster)
 		if err != nil {
 			return models.CommentTagNone, err
@@ -993,7 +997,11 @@ func commentTag(repo *models.Repository, poster *models.User, issue *models.Issu
 			return models.CommentTagSysAdmin, nil
 		}
 
-		return models.CommentTagNone, nil
+		if ok, err = repo.IsCollaborator(poster.ID); ok && err == nil {
+			return models.CommentTagWriter, nil
+		}
+
+		return models.CommentTagNone, err
 	}
 
 	if perm.CanWrite(models.UnitTypeCode) {

templates/repo/issue/view_content/comments.tmpl

@@ -43,7 +43,7 @@
 					</div>
 					<div class="comment-header-right actions df ac">
 						{{if not $.Repository.IsArchived}}
-							{{if eq .PosterID .Issue.PosterID }}
+							{{if or (and (eq .PosterID .Issue.PosterID) (eq .Issue.OriginalAuthorID 0)) (eq .Issue.OriginalAuthorID .OriginalAuthorID) }}
 								<div class="ui basic label">
 									{{$.i18n.Tr "repo.issues.poster"}}
 								</div>