1
0
Fork 0
mirror of https://github.com/pawelmalak/flame.git synced 2025-07-24 13:39:35 +02:00

Merge branch 'pawelmalak:master' into master

This commit is contained in:
Matthew Horwood 2021-12-15 21:38:03 +00:00 committed by GitHub
commit 8029fff679
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
68 changed files with 27519 additions and 932 deletions

View file

@ -28,17 +28,15 @@ const getAllApps = asyncWrapper(async (req, res, next) => {
// apps visibility
const where = req.isAuthenticated ? {} : { isPublic: true };
if (orderType == 'name') {
apps = await App.findAll({
order: [[Sequelize.fn('lower', Sequelize.col('name')), 'ASC']],
where,
});
} else {
apps = await App.findAll({
order: [[orderType, 'ASC']],
where,
});
}
const order =
orderType == 'name'
? [[Sequelize.fn('lower', Sequelize.col('name')), 'ASC']]
: [[orderType, 'ASC']];
apps = await App.findAll({
order,
where,
});
if (process.env.NODE_ENV === 'production') {
// Set header to fetch containers info every time