Fix creating lists with non ascii characters (#607)
Fix test name
Fix migrating lists with non utf-8 characters in their name
Fix creating lists with non utf-8 characters
Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/api/pulls/607
(cherry picked from commit 4db06ba9a1
)
This commit is contained in:
parent
960258a8c2
commit
b1c750373e
3 changed files with 14 additions and 4 deletions
|
@ -55,7 +55,7 @@ func init() {
|
||||||
// The general idea here is to take the title and slice it into pieces, until we found a unique piece.
|
// The general idea here is to take the title and slice it into pieces, until we found a unique piece.
|
||||||
|
|
||||||
var exists = true
|
var exists = true
|
||||||
titleSlug := strings.Replace(strings.ToUpper(l.Title), " ", "", -1)
|
titleSlug := []rune(strings.Replace(strings.ToUpper(l.Title), " ", "", -1))
|
||||||
|
|
||||||
// We can save at most 10 characters in the db, so we need to ensure it has at most 10 characters
|
// We can save at most 10 characters in the db, so we need to ensure it has at most 10 characters
|
||||||
if len(titleSlug) > 10 {
|
if len(titleSlug) > 10 {
|
||||||
|
@ -72,7 +72,7 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Take a random part of the title slug, starting at the beginning
|
// Take a random part of the title slug, starting at the beginning
|
||||||
l.Identifier = titleSlug[i:]
|
l.Identifier = string(titleSlug[i:])
|
||||||
exists, err = sess.
|
exists, err = sess.
|
||||||
Where("identifier = ?", l.Identifier).
|
Where("identifier = ?", l.Identifier).
|
||||||
And("id != ?", l.ID).
|
And("id != ?", l.ID).
|
||||||
|
|
|
@ -404,7 +404,7 @@ func GenerateListIdentifier(l *List, sess *xorm.Engine) (err error) {
|
||||||
// The general idea here is to take the title and slice it into pieces, until we found a unique piece.
|
// The general idea here is to take the title and slice it into pieces, until we found a unique piece.
|
||||||
|
|
||||||
var exists = true
|
var exists = true
|
||||||
titleSlug := strings.Replace(strings.ToUpper(l.Title), " ", "", -1)
|
titleSlug := []rune(strings.Replace(strings.ToUpper(l.Title), " ", "", -1))
|
||||||
|
|
||||||
// We can save at most 10 characters in the db, so we need to ensure it has at most 10 characters
|
// We can save at most 10 characters in the db, so we need to ensure it has at most 10 characters
|
||||||
if len(titleSlug) > 10 {
|
if len(titleSlug) > 10 {
|
||||||
|
@ -421,7 +421,7 @@ func GenerateListIdentifier(l *List, sess *xorm.Engine) (err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Take a random part of the title slug, starting at the beginning
|
// Take a random part of the title slug, starting at the beginning
|
||||||
l.Identifier = titleSlug[i:]
|
l.Identifier = string(titleSlug[i:])
|
||||||
exists, err = sess.
|
exists, err = sess.
|
||||||
Where("identifier = ?", l.Identifier).
|
Where("identifier = ?", l.Identifier).
|
||||||
And("id != ?", l.ID).
|
And("id != ?", l.ID).
|
||||||
|
|
|
@ -79,6 +79,16 @@ func TestList_CreateOrUpdate(t *testing.T) {
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
assert.True(t, IsErrListIdentifierIsNotUnique(err))
|
assert.True(t, IsErrListIdentifierIsNotUnique(err))
|
||||||
})
|
})
|
||||||
|
t.Run("non ascii characters", func(t *testing.T) {
|
||||||
|
db.LoadAndAssertFixtures(t)
|
||||||
|
list := List{
|
||||||
|
Title: "приффки фсем",
|
||||||
|
Description: "Lorem Ipsum",
|
||||||
|
NamespaceID: 1,
|
||||||
|
}
|
||||||
|
err := list.Create(usr)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("update", func(t *testing.T) {
|
t.Run("update", func(t *testing.T) {
|
||||||
|
|
Loading…
Reference in a new issue