diff options
| author | 6543 <6543@obermui.de> | 2019-12-29 00:33:13 +0100 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-12-28 23:33:13 +0000 |
| commit | 261c3a56a20659a11017ba03e627bf4c789c6899 (patch) | |
| tree | 074fd8bb258b07f124a16bd02938508fdfd42c5e | |
| parent | 599c0ee75ffea3ad5f0049ac7d275081370eb149 (diff) | |
| download | gitea-261c3a56a20659a11017ba03e627bf4c789c6899.tar.gz gitea-261c3a56a20659a11017ba03e627bf4c789c6899.zip | |
[Fix] Release attachment should use DownloadURL() not Name (#9529)
* Handle if two or more attachments have the same name
* previously only the first could be downloaded - now each is downloadable
* dos also take care of #6506 (fix was: #6512)
* use func DownloadURL() at issue attatchments too
| -rw-r--r-- | routers/repo/repo.go | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/attachments.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/release/list.tmpl | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 969f96bfba..d44812729f 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -426,7 +426,7 @@ func RedirectDownload(ctx *context.Context) { return } if att != nil { - ctx.Redirect(setting.AppSubURL + "/attachments/" + att.UUID) + ctx.Redirect(att.DownloadURL()) return } } diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index e2d7d1b9de..a97f5d85da 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -1,9 +1,9 @@ {{range .Attachments}} - <a target="_blank" rel="noopener noreferrer" href="{{AppSubUrl}}/attachments/{{.UUID}}"> + <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}"> {{if FilenameIsImage .Name}} - <img class="ui image" src="{{AppSubUrl}}/attachments/{{.UUID}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> + <img class="ui image" src="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> {{else}} <span class="ui image octicon octicon-desktop-download" title='{{$.ctx.i18n.Tr "repo.issues.attachment.download" .Name}}'></span> {{end}} </a> -{{end}}
\ No newline at end of file +{{end}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 777d3a2b05..90a45b9b67 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -82,11 +82,11 @@ </li> {{end}} {{if .Attachments}} - {{range $attachment := .Attachments}} + {{range .Attachments}} <li> - <a target="_blank" rel="noopener noreferrer" href="{{$.RepoLink}}/releases/download/{{$release.TagName | PathEscape}}/{{$attachment.Name | PathEscape}}"> - <strong><span class="ui image octicon octicon-package" title='{{$attachment.Name}}'></span> {{$attachment.Name}}</strong> - <span class="ui text grey right">{{$attachment.Size | FileSize}}</span> + <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}"> + <strong><span class="ui image octicon octicon-package" title='{{.Name}}'></span> {{.Name}}</strong> + <span class="ui text grey right">{{.Size | FileSize}}</span> </a> </li> {{end}} |