kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Lang 2008-12-02 17:16:06 +00:00
parent d3386a5af7
commit 1ce2ed065a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb vendored
View File

@ -66,8 +66,11 @@ module Redmine
end end
cond.add(Project.allowed_to_condition(user, provider_options[:permission], options)) if provider_options[:permission] cond.add(Project.allowed_to_condition(user, provider_options[:permission], options)) if provider_options[:permission]
scope_options[:conditions] = cond.conditions scope_options[:conditions] = cond.conditions
scope_options[:order] = "#{provider_options[:timestamp]} DESC" 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] scope_options[:limit] = options[:limit]
end
with_scope(:find => scope_options) do with_scope(:find => scope_options) do
find(:all, provider_options[:find_options]) find(:all, provider_options[:find_options])