tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-10-31 11:28:24 +00:00
Code Releases Activity

Reading pull attachments should depend on read UnitTypePullRequests (#10346) (#10354)

Browse Source 
Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
guillep2k
2020-02-19 00:02:50 -03:00
committed by GitHub
parent 3e40f8bebc
commit 14bd120cdc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/attachment.go
View File

@@ -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 {

2
models/attachment_test.go
View File

@@ -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},
} }