From c3cbf87b3dd30805d8e42f8d19999de9f98edf2c Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 27 Dec 2013 16:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=92=E5=BA=8F=E5=A4=A7?= =?UTF-8?q?=E6=A6=82=E6=90=9E=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/welcome_helper.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index fc19ccaa0..c39f1f543 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -109,13 +109,13 @@ module WelcomeHelper # resultSet = Memo.where('memos.parent_id IS NULL').includes(:last_reply).order('COALESCE (last_replies_memos.created_at, memos.created_at) DESC').limit(limit) # resultSet += Message.where('messages.parent_id IS NULL').includes(:last_reply).order('COALESCE (last_replies_messages.created_on, messages.created_on) DESC').limit(limit) - resultSet = Memo.where('parent_id IS NULL').order('updated_at DESC').limit(limit) - resultSet += Message.where('parent_id IS NULL').order('updated_on DESC').limit(limit) - # resultSet = resultSet.to_a + resultSet = Memo.includes(:children).where('parent_id IS NULL').order('updated_at DESC').limit(limit) + resultSet += Message.includes(:children).where('parent_id IS NULL').order('updated_on DESC').limit(limit) resultSet.sort! {|x,y| y.event_datetime <=> x.event_datetime} - # for i in 0..(resultSet.size-1) - # resultSet[i] = resultSet[i].parent if resultSet[i].parent - # end + resultSet = resultSet.to_a + for i in 0..(resultSet.size-1) + resultSet[i] = resultSet[i].children.last if resultSet[i].children.count > 0 + end resultSet.take(limit) end