From eabce19a2951786179122379d243dd247a2cf35c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 27 Jul 2023 08:48:54 +0800 Subject: [PATCH 1/3] fix bug --- services/convert/attachment.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/convert/attachment.go b/services/convert/attachment.go index ab36a1c577856..56fdc6b9c11df 100644 --- a/services/convert/attachment.go +++ b/services/convert/attachment.go @@ -16,10 +16,6 @@ func WebAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachm } func APIAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachment) string { - if attach.CustomDownloadURL != "" { - return attach.CustomDownloadURL - } - // /repos/{owner}/{repo}/releases/{id}/assets/{attachment_id} return setting.AppURL + "api/repos/" + repo.FullName() + "/releases/" + strconv.FormatInt(attach.ReleaseID, 10) + "/assets/" + strconv.FormatInt(attach.ID, 10) } From 1858d7bf19c3b5d4e47d074045b3f518ef404dc8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 27 Jul 2023 10:23:38 +0800 Subject: [PATCH 2/3] Fix bug --- tests/integration/api_releases_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 7f439390833e3..31a02bb724669 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -38,6 +38,8 @@ func TestAPIListReleases(t *testing.T) { case 1: assert.False(t, release.IsDraft) assert.False(t, release.IsPrerelease) + assert.Len(t, release.Attachments, 1) + assert.EqualValues(t, "http://localhost:3003/api/repos/user2/repo1/releases/1/assets/9", release.Attachments[0].DownloadURL) case 4: assert.True(t, release.IsDraft) assert.False(t, release.IsPrerelease) From ca5fe01c20ce7edee01769c9a7cf609b2ea4f474 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 27 Jul 2023 12:17:20 +0800 Subject: [PATCH 3/3] Fix test --- tests/integration/api_releases_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 31a02bb724669..40ea1cac15537 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -14,6 +14,7 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" @@ -39,7 +40,7 @@ func TestAPIListReleases(t *testing.T) { assert.False(t, release.IsDraft) assert.False(t, release.IsPrerelease) assert.Len(t, release.Attachments, 1) - assert.EqualValues(t, "http://localhost:3003/api/repos/user2/repo1/releases/1/assets/9", release.Attachments[0].DownloadURL) + assert.EqualValues(t, setting.AppURL+"api/repos/user2/repo1/releases/1/assets/9", release.Attachments[0].DownloadURL) case 4: assert.True(t, release.IsDraft) assert.False(t, release.IsPrerelease)