mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-27 13:25:23 +02:00
Reading pull attachments should depend on read UnitTypePullRequests (#10346)
* Make pull attachments depend on read UnitTypePullRequests Fixes #10336 * Fix test
This commit is contained in:
parent
9f1f2e6675
commit
41294b53b3
2 changed files with 6 additions and 2 deletions
|
@ -79,7 +79,11 @@ func (a *Attachment) LinkedRepository() (*Repository, UnitType, error) {
|
||||||
return nil, UnitTypeIssues, err
|
return nil, UnitTypeIssues, err
|
||||||
}
|
}
|
||||||
repo, err := GetRepositoryByID(iss.RepoID)
|
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 {
|
} else if a.ReleaseID != 0 {
|
||||||
rel, err := GetReleaseByID(a.ReleaseID)
|
rel, err := GetReleaseByID(a.ReleaseID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -138,7 +138,7 @@ func TestLinkedRepository(t *testing.T) {
|
||||||
expectedUnitType UnitType
|
expectedUnitType UnitType
|
||||||
}{
|
}{
|
||||||
{"LinkedIssue", 1, &Repository{ID: 1}, UnitTypeIssues},
|
{"LinkedIssue", 1, &Repository{ID: 1}, UnitTypeIssues},
|
||||||
{"LinkedComment", 3, &Repository{ID: 1}, UnitTypeIssues},
|
{"LinkedComment", 3, &Repository{ID: 1}, UnitTypePullRequests},
|
||||||
{"LinkedRelease", 9, &Repository{ID: 1}, UnitTypeReleases},
|
{"LinkedRelease", 9, &Repository{ID: 1}, UnitTypeReleases},
|
||||||
{"Notlinked", 10, nil, -1},
|
{"Notlinked", 10, nil, -1},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue