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 f9af4e4d1dc07b98f2d680d7f7a3c772d51ce9df Author: Benjamin <poussin@codelutin.com> Date: Sat May 16 22:51:14 2020 +0200 correction compteur de visit et date d'import --- pkg/model/bookmark.go | 8 +++++--- pkg/repository/database.go | 1 + web/src/components/Bookmark.vue | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/model/bookmark.go b/pkg/model/bookmark.go index 6280a7c..3037a4d 100644 --- a/pkg/model/bookmark.go +++ b/pkg/model/bookmark.go @@ -15,12 +15,14 @@ type Bookmark struct { Tags []string `json:"tags,omitempty"` CreationDate time.Time `json:"creationdate,omitempty"` UpdateDate time.Time `json:"updatedate,omitempty"` - ImportDate time.Time `json:"importdate,omitempty"` + // poiteur pour qu'il puisse etre null + ImportDate *time.Time `json:"importdate,omitempty"` PrivateAlias []string `json:"privatealias,omitempty"` PublicAlias []string `json:"publicalias,omitempty"` - AuthenticationInfo AuthenticationInfo `json:"authenticationinfo,omitempty"` + // poiteur pour qu'il puisse etre null + AuthenticationInfo *AuthenticationInfo `json:"authenticationinfo,omitempty"` Favicon []byte `json:"favicon,omitempty"` Screenshot []byte `json:"screenshot,omitempty"` - Visit int64 `json:"visit,omitempty"` + Visit int64 `json:"visit"` // on veut zero dans la base, donc ne pas mettre omitempty Lang string `json:"lang,omitempty"` } diff --git a/pkg/repository/database.go b/pkg/repository/database.go index b7fb676..e4ff5f7 100644 --- a/pkg/repository/database.go +++ b/pkg/repository/database.go @@ -26,6 +26,7 @@ type errorLineExtract struct { Text string // Text of the line without a new line character. } +// Use to normalize orderBy to prevent SQL injection // key: struct field name or database field name in lower case // value: database field name (to use in query) var bookmakFields = make(map[string]string) diff --git a/web/src/components/Bookmark.vue b/web/src/components/Bookmark.vue index ecf83cc..4f03812 100644 --- a/web/src/components/Bookmark.vue +++ b/web/src/components/Bookmark.vue @@ -106,6 +106,7 @@ export default Bookmark display: flex; flex-direction: row; justify-content: space-between; + align-items: flex-start; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.