local-it/vikunja-api
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only check if a bucket limit is exceeded when moving a task between buckets

Browse source
This commit is contained in:
kolaente 2020-09-04 22:01:33 +02:00
parent 14d706c91e
commit ecf09e17a8
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/models/tasks.go
View file

@ -787,9 +787,12 @@ func (t *Task) Update() (err error) {
}
// Check the bucket limit
if err := checkBucketLimit(s, t, bucket); err != nil {
_ = s.Rollback()
return err
// Only check the bucket limit if the task is being moved between buckets, allow reordering the task within a bucket
if t.BucketID != ot.BucketID {
if err := checkBucketLimit(s, t, bucket); err != nil {
_ = s.Rollback()
return err
}
}
// Update the labels

13
pkg/models/tasks_test.go
View file

@ -136,6 +136,19 @@ func TestTask_Update(t *testing.T) {
assert.Error(t, err)
assert.True(t, IsErrBucketLimitExceeded(err))
})
t.Run("full bucket but not changing the bucket", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
task := &Task{
ID: 4,
Title: "test10000",
Description: "Lorem Ipsum Dolor",
Position: 10,
ListID: 1,
BucketID: 2, // Bucket 2 already has 3 tasks and a limit of 3
}
err := task.Update()
assert.NoError(t, err)
})
}
func TestTask_Delete(t *testing.T) {