| @@ -7,5 +7,6 class Meeting < ActiveRecord::Base | |||
|
|
7 | 7 | :url => Proc.new {|o| {:controller => 'meetings', :action => 'show', :id => o.id}} |
|
|
8 | 8 | |
|
|
9 | 9 | acts_as_activity_provider :timestamp => 'scheduled_on', |
|
|
10 |
: |
|
|
|
10 | :scope => includes(:project), | |
|
|
11 | :permission => nil | |
|
|
11 | 12 | end |
| @@ -29,7 +29,7 module Redmine | |||
|
|
29 | 29 | send :include, Redmine::Acts::ActivityProvider::InstanceMethods |
|
|
30 | 30 | end |
|
|
31 | 31 | |
|
|
32 |
options.assert_valid_keys(:type, :permission, :timestamp, :author_key, |
|
|
|
32 | options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :scope) | |
|
|
33 | 33 | self.activity_provider_options ||= {} |
|
|
34 | 34 | |
|
|
35 | 35 | # One model can provide different event types |
| @@ -37,7 +37,6 module Redmine | |||
|
|
37 | 37 | event_type = options.delete(:type) || self.name.underscore.pluralize |
|
|
38 | 38 | |
|
|
39 | 39 | options[:timestamp] ||= "#{table_name}.created_on" |
|
|
40 | options[:find_options] ||= {} | |
|
|
41 | 40 | options[:author_key] = "#{table_name}.#{options[:author_key]}" if options[:author_key].is_a?(Symbol) |
|
|
42 | 41 | self.activity_provider_options[event_type] = options |
|
|
43 | 42 | end |
General Comments 0
You need to be logged in to leave comments.
Login now