diff options
Diffstat (limited to 'app/models/message.rb')
| -rw-r--r-- | app/models/message.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/message.rb b/app/models/message.rb index 77c9ff550..776af6e4a 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -24,7 +24,7 @@ class Message < ActiveRecord::Base acts_as_searchable :columns => ['subject', 'content'], :include => {:board => :project}, - :project_key => 'project_id', + :project_key => "#{Board.table_name}.project_id", :date_column => "#{table_name}.created_on" acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"}, :description => :content, @@ -43,7 +43,7 @@ class Message < ActiveRecord::Base after_create :add_author_as_watcher named_scope :visible, lambda {|*args| { :include => {:board => :project}, - :conditions => Project.allowed_to_condition(args.first || User.current, :view_messages) } } + :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } } def visible?(user=User.current) !user.nil? && user.allowed_to?(:view_messages, project) |