diff options
| author | zeripath <art27@cantab.net> | 2020-08-04 22:30:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 22:30:02 +0100 |
| commit | 33391e04feb6be1c2f8bec0928f500df0f110d89 (patch) | |
| tree | 98b88a52e2c0166c6eefb57215fc9fa7bbb473c6 | |
| parent | 8a6790b2aa07fa006d0338669e1da6134a58e313 (diff) | |
| download | gitea-33391e04feb6be1c2f8bec0928f500df0f110d89.tar.gz gitea-33391e04feb6be1c2f8bec0928f500df0f110d89.zip | |
Prevent empty div when editing comment (#12404)
* Prevent empty div when editing comment
The template for attachments needs to remove whitespace and return empty when there are no attachments.
Fix #10220
| -rw-r--r-- | routers/repo/issue.go | 6 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/attachments.tmpl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index b3af6705ca..1f8f484132 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1975,7 +1975,7 @@ func updateAttachments(item interface{}, files []string) error { case *models.Comment: attachments = content.Attachments default: - return fmt.Errorf("Unknow Type") + return fmt.Errorf("Unknown Type: %T", content) } for i := 0; i < len(attachments); i++ { if util.IsStringInSlice(attachments[i].UUID, files) { @@ -1993,7 +1993,7 @@ func updateAttachments(item interface{}, files []string) error { case *models.Comment: err = content.UpdateAttachments(files) default: - return fmt.Errorf("Unknow Type") + return fmt.Errorf("Unknown Type: %T", content) } if err != nil { return err @@ -2005,7 +2005,7 @@ func updateAttachments(item interface{}, files []string) error { case *models.Comment: content.Attachments, err = models.GetAttachmentsByCommentID(content.ID) default: - return fmt.Errorf("Unknow Type") + return fmt.Errorf("Unknown Type: %T", content) } return err } diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index 2d3c638179..3c69dbc2ba 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -1,4 +1,4 @@ -{{range .Attachments}} +{{- range .Attachments -}} <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}}'> {{if FilenameIsImage .Name}} @@ -12,4 +12,4 @@ <div class="four wide column" style="padding: 0px;"> <span class="ui text grey right">{{.Size | FileSize}}</span> </div> -{{end}} +{{end -}} |