self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-04 21:35:03 +02:00
Code Issues Releases Activity

Server: Sort flags by date

Browse Source
This commit is contained in:
Laurent Cozic 2021-10-07 14:28:44 +01:00
parent 5b58811833
commit 31efc9b23e
2 changed files with 6 additions and 0 deletions
packages/server/src
routes/index
users.ts
tools
debugTools.ts

4
packages/server/src/routes/index/users.ts

@ -157,6 +157,10 @@ router.get('users/:id', async (path: SubPath, ctx: AppContext, user: User = null
};
});
userFlagViews.sort((a, b) => {
return a.created_time < b.created_time ? +1 : -1;
});
if (!owner.is_admin) userFlagViews = [];
const subscription = !isNew ? await ctx.joplin.models.subscription().byUserId(userId) : null;

2
packages/server/src/tools/debugTools.ts

@ -1,3 +1,4 @@
import time from '@joplin/lib/time';
import { DbConnection, dropTables, migrateLatest } from '../db';
import newModelFactory from '../models/factory';
import { AccountType } from '../models/UserModel';
@ -93,6 +94,7 @@ export async function createTestUsers(db: DbConnection, config: Config, options:
});
await models.userFlag().add(user.id, UserFlagType.AccountOverLimit);
await time.sleep(2);
await models.userFlag().add(user.id, UserFlagType.FailedPaymentWarning);
}
}