From 7a2405aa9ebaa04ba434480bbbb3c01a69c19ea2 Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Mon, 14 Dec 2020 18:15:07 -0500 Subject: [PATCH] Fixed 500 caused by room search (#2366) --- app/models/user.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index dd90c14e..29c8b05f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -97,6 +97,8 @@ class User < ApplicationRecord # Returns a list of rooms ordered by last session (with nil rooms last) def ordered_rooms + return [] if main_room.nil? + [main_room] + rooms.where.not(id: main_room.id).order(Arel.sql("last_session IS NULL, last_session desc")) end