mirror of
https://github.com/nodemailer/wildduck.git
synced 2025-10-04 02:46:57 +08:00
Only sort searhc by date if order is set
This commit is contained in:
parent
1a210d184d
commit
35ac8e74cf
2 changed files with 5 additions and 5 deletions
|
@ -2023,7 +2023,7 @@ paths:
|
|||
type: number
|
||||
- name: order
|
||||
in: query
|
||||
description: Ordering of the records by insert date
|
||||
description: Ordering of the records by insert date. If no order is supplied, results are sorted by heir mongoDB ObjectId.
|
||||
schema:
|
||||
$ref: '#/components/schemas/Order'
|
||||
- name: page
|
||||
|
|
|
@ -536,7 +536,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
|
|||
const schema = searchSchema.keys({
|
||||
threadCounters: booleanSchema.default(false),
|
||||
limit: Joi.number().default(20).min(1).max(250),
|
||||
order: Joi.any().empty('').allow('asc', 'desc').default('desc'),
|
||||
order: Joi.any().empty('').allow('asc', 'desc').optional(),
|
||||
next: nextPageCursorSchema,
|
||||
previous: previousPageCursorSchema,
|
||||
page: pageNrSchema
|
||||
|
@ -570,7 +570,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
|
|||
let page = result.value.page;
|
||||
let pageNext = result.value.next;
|
||||
let pagePrevious = result.value.previous;
|
||||
let sortAscending = result.value.order === 'asc';
|
||||
let order = result.value.order;
|
||||
|
||||
let { filter, query } = await prepareSearchFilter(db, user, result.value);
|
||||
|
||||
|
@ -611,8 +611,8 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
|
|||
flags: true
|
||||
}
|
||||
},
|
||||
paginatedField: 'idate',
|
||||
sortAscending
|
||||
paginatedField: order !== undefined ? 'idate' : "_id",
|
||||
sortAscending: order === 'asc' ? true : undefined
|
||||
};
|
||||
|
||||
if (pageNext) {
|
||||
|
|
Loading…
Add table
Reference in a new issue