summaryrefslogtreecommitdiffstats
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 031273d44..4f2debeb7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1251,7 +1251,11 @@ module ApplicationHelper
end
when 'attachment'
attachments = options[:attachments] || []
- attachments += obj.attachments if obj.respond_to?(:attachments)
+ if obj.is_a?(Journal)
+ attachments += obj.journalized.attachments if obj.journalized.respond_to?(:attachments)
+ else
+ attachments += obj.attachments if obj.respond_to?(:attachments)
+ end
if attachments && attachment = Attachment.latest_attach(attachments, name)
link = link_to_attachment(attachment, :only_path => only_path, :class => 'attachment')
end