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

Makes activity providers use visible scopes. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5325 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-04-05 12:52:20 +00:00
parent 405fc07e90
commit da6c149275
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,6 @@ module Redmine
# We store these options in activity_provider_options hash # We store these options in activity_provider_options hash
event_type = options.delete(:type) || self.name.underscore.pluralize event_type = options.delete(:type) || self.name.underscore.pluralize
options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless options.has_key?(:permission)
options[:timestamp] ||= "#{table_name}.created_on" options[:timestamp] ||= "#{table_name}.created_on"
options[:find_options] ||= {} options[:find_options] ||= {}
options[:author_key] = "#{table_name}.#{options[:author_key]}" if options[:author_key].is_a?(Symbol) options[:author_key] = "#{table_name}.#{options[:author_key]}" if options[:author_key].is_a?(Symbol)
@ -60,20 +59,31 @@ module Redmine
if from && to if from && to
cond.add(["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to]) cond.add(["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
end end
if options[:author] if options[:author]
return [] if provider_options[:author_key].nil? return [] if provider_options[:author_key].nil?
cond.add(["#{provider_options[:author_key]} = ?", options[:author].id]) cond.add(["#{provider_options[:author_key]} = ?", options[:author].id])
end end
cond.add(Project.allowed_to_condition(user, provider_options[:permission], options)) if provider_options[:permission]
scope_options[:conditions] = cond.conditions
if options[:limit] if options[:limit]
# id and creation time should be in same order in most cases # id and creation time should be in same order in most cases
scope_options[:order] = "#{table_name}.id DESC" scope_options[:order] = "#{table_name}.id DESC"
scope_options[:limit] = options[:limit] scope_options[:limit] = options[:limit]
end end
scope = self
if provider_options.has_key?(:permission)
cond.add(Project.allowed_to_condition(user, provider_options[:permission] || :view_project, options))
elsif respond_to?(:visible)
scope = scope.visible(user, options)
else
ActiveSupport::Deprecation.warn "acts_as_activity_provider with implicit :permission option is deprecated. Add a visible scope to the #{self.name} model or use explicit :permission option."
cond.add(Project.allowed_to_condition(user, "view_#{self.name.underscore.pluralize}".to_sym, options))
end
scope_options[:conditions] = cond.conditions
with_scope(:find => scope_options) do with_scope(:find => scope_options) do
find(:all, provider_options[:find_options].dup) scope.find(:all, provider_options[:find_options].dup)
end end
end end
end end