branch bow-v2-go updated (ec307ef -> ddd9ad6)
This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from ec307ef correction index fulltext new 62e9ac8 ajout d'une minidoc pour la recherche fulltext new ddd9ad6 correction recup pour l'edition The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ddd9ad64dd250b4802c7c70ab80687fa4f7e5e48 Author: Benjamin <poussin@codelutin.com> Date: Thu May 28 23:23:29 2020 +0200 correction recup pour l'edition commit 62e9ac859aa86213db91fe77365b59b96a2f1eac Author: Benjamin <poussin@codelutin.com> Date: Thu May 28 03:14:34 2020 +0200 ajout d'une minidoc pour la recherche fulltext Summary of changes: pkg/http/bookmarkResource.go | 3 +++ pkg/repository/bookmarkRepository.go | 2 +- web/src/components/SearchInput.vue | 2 +- web/src/views/BookmarkEdit.vue | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 62e9ac859aa86213db91fe77365b59b96a2f1eac Author: Benjamin <poussin@codelutin.com> Date: Thu May 28 03:14:34 2020 +0200 ajout d'une minidoc pour la recherche fulltext --- web/src/components/SearchInput.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/SearchInput.vue b/web/src/components/SearchInput.vue index 9d63979..87edf6c 100644 --- a/web/src/components/SearchInput.vue +++ b/web/src/components/SearchInput.vue @@ -5,7 +5,7 @@ <TagsInput id="tags" v-model="tags" :availableTags="queryTags" :noCreation="true"></TagsInput> </div> <div> - <label for="fulltext">fulltext</label> + <label for="fulltext" title='ex: papa or maman -"petits enfants"'>fulltext</label> <input id="fulltext" type="text" v-model="fulltext" @keyup.enter="searchFulltext(mFulltext)" /> </div> <form :action="$fetch.createUrl('/opensearch')"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit ddd9ad64dd250b4802c7c70ab80687fa4f7e5e48 Author: Benjamin <poussin@codelutin.com> Date: Thu May 28 23:23:29 2020 +0200 correction recup pour l'edition --- pkg/http/bookmarkResource.go | 3 +++ pkg/repository/bookmarkRepository.go | 2 +- web/src/views/BookmarkEdit.vue | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/http/bookmarkResource.go b/pkg/http/bookmarkResource.go index 5809fd0..9738e9b 100644 --- a/pkg/http/bookmarkResource.go +++ b/pkg/http/bookmarkResource.go @@ -59,6 +59,9 @@ func getBookmark(w http.ResponseWriter, r *http.Request) { return } + // on a au moins un resultat (sinon 404) on supprime les [] + json = json[1 : len(json)-1] + w.Header().Add("Content-Type", "application/json") io.WriteString(w, json) } diff --git a/pkg/repository/bookmarkRepository.go b/pkg/repository/bookmarkRepository.go index e2e04ae..1e01756 100644 --- a/pkg/repository/bookmarkRepository.go +++ b/pkg/repository/bookmarkRepository.go @@ -107,7 +107,7 @@ func BookmarkJSON(currentUser model.BowUser, id string, uri string, tags []strin BookmarkByIDJSON retourne le bookmark au format json */ func BookmarkByIDJSON(currentUser model.BowUser, id string) (string, error) { - q := &query{sql: `select json_agg(b.*) as result from bookmark b where id=$4)`} + q := &query{sql: `select json_agg(b.*) as result from bookmark b where id=$1`} result, err := q.QueryString(currentUser, id) if err != nil { diff --git a/web/src/views/BookmarkEdit.vue b/web/src/views/BookmarkEdit.vue index f128373..fcbfc57 100644 --- a/web/src/views/BookmarkEdit.vue +++ b/web/src/views/BookmarkEdit.vue @@ -6,7 +6,7 @@ <input type="text" v-model.trim="bookmark.uri" placeholder="add uri" /> <br /> <!-- <span>{{ bookmark.authenticationinfo }}</span> faire afficher une popup de modification de l'objet auth--> <textarea v-model.trim="bookmark.description" placeholder="add description"></textarea> - <TagsInput id="tags" v-model="bookmark.tags"></TagsInput> <!-- <input type="text" v-model.trim="bookmark.tags" /> <br /> --> + <TagsInput id="tags" v-model="bookmark.tags"></TagsInput> <!-- <span>{{ bookmark.lang }}</span> --> <!-- <span>{{ bookmark.owner }}</span> si mon id n'est pas le meme alors c'est le bookmark d'un autre partage par un group --> <label for="private-alias">private alias: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm