Fix importing filters and labels
This commit is contained in:
parent
edec1f6aa4
commit
9569265405
|
@ -80,6 +80,19 @@ func (v *VikunjaFileMigrator) Migrate(user *user.User, file io.ReaderAt, size in
|
||||||
return fmt.Errorf("could not read data: %s", err)
|
return fmt.Errorf("could not read data: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for _, n := range namespaces {
|
||||||
|
for _, l := range n.Lists {
|
||||||
|
for _, t := range l.Tasks {
|
||||||
|
if len(t.Labels) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, label := range t.Labels {
|
||||||
|
label.ID = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Import files
|
// Import files
|
||||||
// TODO
|
// TODO
|
||||||
|
|
||||||
|
@ -97,7 +110,7 @@ func (v *VikunjaFileMigrator) Migrate(user *user.User, file io.ReaderAt, size in
|
||||||
defer ff.Close()
|
defer ff.Close()
|
||||||
|
|
||||||
var bufFilter bytes.Buffer
|
var bufFilter bytes.Buffer
|
||||||
if _, err := bufData.ReadFrom(ff); err != nil {
|
if _, err := bufFilter.ReadFrom(ff); err != nil {
|
||||||
return fmt.Errorf("could not read filters file: %s", err)
|
return fmt.Errorf("could not read filters file: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,6 +123,7 @@ func (v *VikunjaFileMigrator) Migrate(user *user.User, file io.ReaderAt, size in
|
||||||
defer s.Close()
|
defer s.Close()
|
||||||
|
|
||||||
for _, f := range filters {
|
for _, f := range filters {
|
||||||
|
f.ID = 0
|
||||||
err = f.Create(s, user)
|
err = f.Create(s, user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = s.Rollback()
|
_ = s.Rollback()
|
||||||
|
|
Loading…
Reference in New Issue