Remove the default bucket if it was empty

This commit is contained in:
kolaente 2020-12-17 01:39:05 +01:00
parent 6729330564
commit 575c766c32
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 18 additions and 1 deletions

View File

@ -51,6 +51,7 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
tasks := l.Tasks
originalBuckets := l.Buckets
originalBackgroundInformation := l.BackgroundInformation
needsDefaultBucket := false
l.NamespaceID = n.ID
err = l.Create(user)
@ -105,6 +106,9 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
log.Debugf("[creating structure] No bucket created for original bucket id %d", t.BucketID)
t.BucketID = 0
}
if !exists || t.BucketID == 0 {
needsDefaultBucket = true
}
t.ListID = l.ID
err = t.Create(user)
@ -197,6 +201,20 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
}
}
// All tasks brought their own bucket with them, therefore the newly created default bucket is just extra space
if !needsDefaultBucket {
b := &models.Bucket{ListID: l.ID}
bucketsIn, _, _, err := b.ReadAll(user, "", 1, 1)
if err != nil {
return err
}
buckets := bucketsIn.([]*models.Bucket)
buckets[0].Delete()
if err != nil {
return err
}
}
l.Tasks = tasks
l.Buckets = originalBuckets
}

View File

@ -243,7 +243,6 @@ func convertTrelloDataToVikunja(trelloData []*trello.Board) (fullVikunjaHierachi
fullVikunjaHierachie[0].Lists = append(fullVikunjaHierachie[0].Lists, list)
}
// TODO: Only create a default bucket if no bucket is available
// TODO: More logging
return