troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 20:59:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Prevent empty div when editing comment (#12404)

Browse source 
* Prevent empty div when editing comment

The template for attachments needs to remove whitespace and return empty when there are no attachments.

Fix #10220
This commit is contained in:
zeripath 2020-08-04 22:30:02 +01:00 committed by GitHub
parent 8a6790b2aa
commit 33391e04fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routers/repo/issue.go
View file

@ -1975,7 +1975,7 @@ func updateAttachments(item interface{}, files []string) error {
case *models.Comment: case *models.Comment:
attachments = content.Attachments attachments = content.Attachments
default: default:
return fmt.Errorf("Unknow Type") return fmt.Errorf("Unknown Type: %T", content)
} }
for i := 0; i < len(attachments); i++ { for i := 0; i < len(attachments); i++ {
if util.IsStringInSlice(attachments[i].UUID, files) { if util.IsStringInSlice(attachments[i].UUID, files) {
@ -1993,7 +1993,7 @@ func updateAttachments(item interface{}, files []string) error {
case *models.Comment: case *models.Comment:
err = content.UpdateAttachments(files) err = content.UpdateAttachments(files)
default: default:
return fmt.Errorf("Unknow Type") return fmt.Errorf("Unknown Type: %T", content)
} }
if err != nil { if err != nil {
return err return err
@ -2005,7 +2005,7 @@ func updateAttachments(item interface{}, files []string) error {
case *models.Comment: case *models.Comment:
content.Attachments, err = models.GetAttachmentsByCommentID(content.ID) content.Attachments, err = models.GetAttachmentsByCommentID(content.ID)
default: default:
return fmt.Errorf("Unknow Type") return fmt.Errorf("Unknown Type: %T", content)
} }
return err return err
} }

4
templates/repo/issue/view_content/attachments.tmpl
View file

@ -1,4 +1,4 @@
{{range .Attachments}} {{- range .Attachments -}}
<div class="twelve wide column" style="padding: 6px;"> <div class="twelve wide column" style="padding: 6px;">
<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'>
{{if FilenameIsImage .Name}} {{if FilenameIsImage .Name}}
@ -12,4 +12,4 @@
<div class="four wide column" style="padding: 0px;"> <div class="four wide column" style="padding: 0px;">
<span class="ui text grey right">{{.Size | FileSize}}</span> <span class="ui text grey right">{{.Size | FileSize}}</span>
</div> </div>
{{end}} {{end -}}