meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-13 20:53:07 +00:00
Code Issues Releases Wiki Activity

Removed no longer used :find_options option for acts_as_activity_provider.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14030 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-02-18 21:10:22 +00:00
parent 8ad326f160
commit dbcdc3415d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/sample_plugin/app/models/meeting.rb
View File

@ -7,5 +7,5 @@ class Meeting < ActiveRecord::Base
:url => Proc.new {|o| {:controller => 'meetings', :action => 'show', :id => o.id}}
acts_as_activity_provider :timestamp => 'scheduled_on',
:find_options => { :include => :project }
:scope => includes(:project)
end

3
lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
View File

@ -29,7 +29,7 @@ module Redmine
send :include, Redmine::Acts::ActivityProvider::InstanceMethods
end
options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :find_options, :scope)
options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :scope)
self.activity_provider_options ||= {}
# One model can provide different event types
@ -37,7 +37,6 @@ module Redmine
event_type = options.delete(:type) || self.name.underscore.pluralize
options[:timestamp] ||= "#{table_name}.created_on"
options[:find_options] ||= {}
options[:author_key] = "#{table_name}.#{options[:author_key]}" if options[:author_key].is_a?(Symbol)
self.activity_provider_options[event_type] = options
end