diff options
| -rw-r--r-- | extra/sample_plugin/app/models/meeting.rb | 2 | ||||
| -rw-r--r-- | lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/extra/sample_plugin/app/models/meeting.rb b/extra/sample_plugin/app/models/meeting.rb index c424bdec4..62dcd8abe 100644 --- a/extra/sample_plugin/app/models/meeting.rb +++ b/extra/sample_plugin/app/models/meeting.rb @@ -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 diff --git a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb index 0637428d5..5e96651ca 100644 --- a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb +++ b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb @@ -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 |