From 16c9f998d5563277fec990c9ddaf138e163a66d1 Mon Sep 17 00:00:00 2001 From: Damillora Date: Sat, 11 Sep 2021 02:11:10 +0700 Subject: [PATCH] fix: upload tag error --- pkg/services/tag.go | 6 +++--- web/app/src/routes/Posts.svelte | 1 - web/app/src/routes/Upload.svelte | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/services/tag.go b/pkg/services/tag.go index d513059..f4f616b 100644 --- a/pkg/services/tag.go +++ b/pkg/services/tag.go @@ -21,14 +21,14 @@ func GetTagAll() []models.TagListItem { return tags } -func GetTagAutocomplete() []models.TagAutocompleteListItem { - var tags []models.TagAutocompleteListItem +func GetTagAutocomplete() []string { + var tags []string result := database.DB.Model(&database.Tag{}). Joins("join tag_types on tag_types.id = tags.tag_type_id"). Select("concat(tag_types.name,':',tags.name) as name"). Find(&tags) if result.Error != nil { - return []models.TagAutocompleteListItem{} + return []string{} } return tags } diff --git a/web/app/src/routes/Posts.svelte b/web/app/src/routes/Posts.svelte index 51e3841..0dd45e0 100644 --- a/web/app/src/routes/Posts.svelte +++ b/web/app/src/routes/Posts.svelte @@ -94,7 +94,6 @@ addKeys={[9, 32]} on:tags={onTagChange} autoComplete={onAutocomplete} - autoCompleteKey={"name"} /> diff --git a/web/app/src/routes/Upload.svelte b/web/app/src/routes/Upload.svelte index bc0b0d3..935cabf 100644 --- a/web/app/src/routes/Upload.svelte +++ b/web/app/src/routes/Upload.svelte @@ -112,7 +112,7 @@
- +