From 3dde561fe548a71f531de7096c2948426982603c Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Mon, 6 May 2019 17:28:55 +0900 Subject: [PATCH 01/10] Resolve #4864 (#4865) --- src/server/api/endpoints/users.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index c710706f0c..be317223b6 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -85,8 +85,8 @@ export default define(meta, async (ps, me) => { case '-follower': query.orderBy('user.followersCount', 'ASC'); break; case '+createdAt': query.orderBy('user.createdAt', 'DESC'); break; case '-createdAt': query.orderBy('user.createdAt', 'ASC'); break; - case '+updatedAt': query.orderBy('user.updatedAt', 'DESC'); break; - case '-updatedAt': query.orderBy('user.updatedAt', 'ASC'); break; + case '+updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'DESC'); break; + case '-updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'ASC'); break; default: query.orderBy('user.id', 'ASC'); break; } From 187792dfc4d1d1d16412da92ec71654d489228bc Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 6 May 2019 20:09:13 +0900 Subject: [PATCH 02/10] Fix bug --- .../app/common/views/components/ui/select.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/client/app/common/views/components/ui/select.vue b/src/client/app/common/views/components/ui/select.vue index e8b45a4a29..ec5145ca30 100644 --- a/src/client/app/common/views/components/ui/select.vue +++ b/src/client/app/common/views/components/ui/select.vue @@ -5,10 +5,9 @@