From 465f6d90abb025068d895b5aa9fcde503c0aca0c Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 8 Sep 2021 18:40:43 +0200
Subject: [PATCH] Fix tasks not exported

---
 pkg/models/export.go | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkg/models/export.go b/pkg/models/export.go
index d31938298..472b68ef7 100644
--- a/pkg/models/export.go
+++ b/pkg/models/export.go
@@ -130,6 +130,8 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 
 	namespaceIDs := []int64{}
 	namespaces := []*NamespaceWithListsAndTasks{}
+	listMap := make(map[int64]*ListWithTasksAndBuckets)
+	listIDs := []int64{}
 	for _, n := range namspaces.([]*NamespaceWithLists) {
 		if n.ID < 1 {
 			// Don't include filters
@@ -142,11 +144,14 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 		}
 
 		for _, l := range n.Lists {
-			nn.Lists = append(nn.Lists, &ListWithTasksAndBuckets{
+			ll := &ListWithTasksAndBuckets{
 				List:             *l,
 				BackgroundFileID: l.BackgroundFileID,
 				Tasks:            []*TaskWithComments{},
-			})
+			}
+			nn.Lists = append(nn.Lists, ll)
+			listMap[l.ID] = ll
+			listIDs = append(listIDs, l.ID)
 		}
 
 		namespaceIDs = append(namespaceIDs, n.ID)
@@ -171,15 +176,6 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 		return err
 	}
 
-	listMap := make(map[int64]*ListWithTasksAndBuckets)
-	listIDs := []int64{}
-	for _, l := range lists {
-		listMap[l.ID] = &ListWithTasksAndBuckets{
-			List: *l,
-		}
-		listIDs = append(listIDs, l.ID)
-	}
-
 	taskMap := make(map[int64]*TaskWithComments, len(tasks))
 	for _, t := range tasks {
 		taskMap[t.ID] = &TaskWithComments{