Skip to content

O
OHR Support
Commit 3279b2ad authored by Tim Felgentreff's avatar Tim Felgentreff
Browse files
Options

fix mailer tests

parent 48533559
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
app/models/message.rb
View file @ 3279b2ad
......@@ -26,11 +26,12 @@ class Message < ActiveRecord::Base
:event_description => :content,
:event_type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
:event_url => (Proc.new do |o|
if o.parent_id.nil?
{:id => o.id}
msg = o.journaled
if msg.parent_id.nil?
{:id => msg.id}
else
{:id => o.parent_id, :r => o.journaled.id, :anchor => "message-#{o.journaled.id}"}
end.reverse_merge :controller => 'messages', :action => 'show', :board_id => o.board_id
{:id => msg.parent_id, :r => msg.id, :anchor => "message-#{msg.id}"}
end.reverse_merge :controller => 'messages', :action => 'show', :board_id => msg.board_id
end),
:activity_find_options => { :include => { :board => :project } }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment