This commit is contained in:
@@ -19,7 +19,9 @@ router.get('/list', async (req, res) => {
|
||||
const hasAccess = await userOwnsCampaign(campaign, req.user.id);
|
||||
if (!hasAccess) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
|
||||
const folders = await Folder.find({ campaign })
|
||||
// The note tree only: item folders share this model and would otherwise
|
||||
// turn up as empty folders between the notes.
|
||||
const folders = await Folder.find({ campaign, target: { $ne: 'item' } })
|
||||
.select('_id name parentFolder date color')
|
||||
.sort({ date: -1 })
|
||||
.lean();
|
||||
@@ -48,7 +50,7 @@ router.get('/subfolder/list', async (req, res) => {
|
||||
const folderDoc = await Folder.findOne({ _id: folder, campaign }).lean();
|
||||
if (!folderDoc) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
|
||||
const subfolders = await Folder.find({ campaign, parentFolder: folder })
|
||||
const subfolders = await Folder.find({ campaign, parentFolder: folder, target: { $ne: 'item' } })
|
||||
.select('_id name date color')
|
||||
.sort({ date: -1 })
|
||||
.lean();
|
||||
@@ -80,7 +82,7 @@ router.get('/all', async (req, res) => {
|
||||
.sort({ title: 1 })
|
||||
.lean();
|
||||
|
||||
const folders = await Folder.find({ campaign })
|
||||
const folders = await Folder.find({ campaign, target: { $ne: 'item' } })
|
||||
.select('_id name parentFolder')
|
||||
.lean();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user