From 258e927d6d621ce187c6f78674826a9e85a950cc Mon Sep 17 00:00:00 2001 From: souravirus Date: Fri, 8 Jun 2018 23:12:35 +0530 Subject: [PATCH 1/2] Added group by note.nid --- app/controllers/home_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index b1b7c4542d..584fb2ede2 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -121,7 +121,7 @@ def activity .where('node_revisions.status = 1') .where('timestamp - node.created > ?', 300) # don't report edits within 5 mins of page creation .limit(10) - .group('node.title') + .group(['node.title', 'note.nid']) # group by day: http://stackoverflow.com/questions/5970938/group-by-day-from-timestamp revisions = revisions.group('DATE(FROM_UNIXTIME(timestamp))') if Rails.env == 'production' revisions = revisions.to_a # ensure it can be serialized for caching From b0b1fc05bda3e61d949293a28322258dc04eb044 Mon Sep 17 00:00:00 2001 From: souravirus Date: Fri, 8 Jun 2018 23:35:42 +0530 Subject: [PATCH 2/2] correction --- app/controllers/home_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 584fb2ede2..f6678fa9b9 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -121,7 +121,7 @@ def activity .where('node_revisions.status = 1') .where('timestamp - node.created > ?', 300) # don't report edits within 5 mins of page creation .limit(10) - .group(['node.title', 'note.nid']) + .group(['node.title', 'node.nid']) # group by day: http://stackoverflow.com/questions/5970938/group-by-day-from-timestamp revisions = revisions.group('DATE(FROM_UNIXTIME(timestamp))') if Rails.env == 'production' revisions = revisions.to_a # ensure it can be serialized for caching