diff options
| author | zeripath <art27@cantab.net> | 2020-02-19 00:36:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 21:36:19 -0300 |
| commit | 41294b53b3ca4b478b74e05e7d012899bf51e19f (patch) | |
| tree | 13b87bf7ba699136984a6d7e15a67753c9929bdd /models | |
| parent | 9f1f2e66757d49a7e7096501514bd90a53190ec0 (diff) | |
| download | gitea-41294b53b3ca4b478b74e05e7d012899bf51e19f.tar.gz gitea-41294b53b3ca4b478b74e05e7d012899bf51e19f.zip | |
Reading pull attachments should depend on read UnitTypePullRequests (#10346)
* Make pull attachments depend on read UnitTypePullRequests
Fixes #10336
* Fix test
Diffstat (limited to 'models')
| -rw-r--r-- | models/attachment.go | 6 | ||||
| -rw-r--r-- | 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}, } |