refactor to IsLinked

Author: sapk

models/attachment.go

@@ -42,9 +42,9 @@ func (a *Attachment) IncreaseDownloadCount() error {
 	return nil
 }
 
-// IsNotAttached define is the attachement is linked to an issue or release
-func (a *Attachment) IsNotAttached() bool {
-	return a.ReleaseID == 0 && a.IssueID == 0
+// IsLinked define is the attachement is linked to an issue or release
+func (a *Attachment) IsLinked() bool {
+	return a.ReleaseID != 0 || a.IssueID != 0
 }
 
 // APIFormat converts models.Attachment to api.Attachment

models/issue.go

@@ -1171,7 +1171,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
 		}
 
 		for i := 0; i < len(attachments); i++ {
-			if !attachments[i].IsNotAttached() {
+			if attachments[i].IsLinked() {
 				log.Error("newIssue [%s]: skipping already linked attachement", attachments[i].UUID)
 				continue
 			}

models/issue_comment.go

@@ -612,7 +612,7 @@ func sendCreateCommentAction(e *xorm.Session, opts *CreateCommentOptions, commen
 		}
 
 		for i := range attachments {
-			if !attachments[i].IsNotAttached() {
+			if attachments[i].IsLinked() {
 				log.Error("sendCreateCommentAction [%s]: skipping already linked attachement", attachments[i].UUID)
 				continue
 			}

models/release.go

@@ -156,7 +156,7 @@ func linkReleaseAttachments(releaseID int64, attachmentUUIDs []string) (err erro
 	}
 
 	for i := range attachments {
-		if !attachments[i].IsNotAttached() {
+		if attachments[i].IsLinked() {
 			log.Error("linkReleaseAttachments [%s]: skipping already linked attachement", attachments[i].UUID)
 			continue
 		}

routers/routes/routes.go

@@ -491,7 +491,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			}
 
 			//Attachement without issue or release attached should not be returned
-			if attach.IsNotAttached() {
+			if !attach.IsLinked() {
 				ctx.Error(404)
 				return
 			}