From 1ce2ed065a24d954e3527f69848956ddebfac8a7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 2 Dec 2008 17:16:06 +0000 Subject: [PATCH] Fixed: activity broken by r2066 with postgresql (#2266). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2083 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../lib/acts_as_activity_provider.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb index d631935e0..bd38276f7 100644 --- a/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb +++ b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb @@ -66,8 +66,11 @@ module Redmine end cond.add(Project.allowed_to_condition(user, provider_options[:permission], options)) if provider_options[:permission] scope_options[:conditions] = cond.conditions - scope_options[:order] = "#{provider_options[:timestamp]} DESC" - scope_options[:limit] = options[:limit] + if options[:limit] + # id and creation time should be in same order in most cases + scope_options[:order] = "#{table_name}.id DESC" + scope_options[:limit] = options[:limit] + end with_scope(:find => scope_options) do find(:all, provider_options[:find_options])