From 41294b53b3ca4b478b74e05e7d012899bf51e19f Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Wed, 19 Feb 2020 00:36:19 +0000
Subject: [PATCH] Reading pull attachments should depend on read
UnitTypePullRequests (#10346)
* Make pull attachments depend on read UnitTypePullRequests
Fixes #10336
* Fix test
---
models/attachment.go | 6 +++++-
models/attachment_test.go | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/models/attachment.go b/models/attachment.go
index 6cfa6cb64e..81f2e15dad 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -79,7 +79,11 @@ func (a *Attachment) LinkedRepository() (*Repository, UnitType, error) {
return nil, UnitTypeIssues, err
}
repo, err := GetRepositoryByID(iss.RepoID)
- return repo, UnitTypeIssues, err
+ unitType := UnitTypeIssues
+ if iss.IsPull {
+ unitType = UnitTypePullRequests
+ }
+ return repo, unitType, err
} else if a.ReleaseID != 0 {
rel, err := GetReleaseByID(a.ReleaseID)
if err != nil {
diff --git a/models/attachment_test.go b/models/attachment_test.go
index ddb6abad32..7d681e0519 100644
--- a/models/attachment_test.go
+++ b/models/attachment_test.go
@@ -138,7 +138,7 @@ func TestLinkedRepository(t *testing.T) {
expectedUnitType UnitType
}{
{"LinkedIssue", 1, &Repository{ID: 1}, UnitTypeIssues},
- {"LinkedComment", 3, &Repository{ID: 1}, UnitTypeIssues},
+ {"LinkedComment", 3, &Repository{ID: 1}, UnitTypePullRequests},
{"LinkedRelease", 9, &Repository{ID: 1}, UnitTypeReleases},
{"Notlinked", 10, nil, -1},
}