diff options
| -rw-r--r-- | app/helpers/attachments_helper.rb | 11 | ||||
| -rw-r--r-- | app/views/attachments/_links.html.erb | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index bc3ba518d..f7f9007b5 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -34,12 +34,17 @@ module AttachmentsHelper def link_to_attachments(container, options = {}) options.assert_valid_keys(:author, :thumbnails) - if container.attachments.any? - options = {:deletable => container.attachments_deletable?, :author => true}.merge(options) + attachments = container.attachments.preload(:author).to_a + if attachments.any? + options = { + :editable => container.attachments_editable?, + :deletable => container.attachments_deletable?, + :author => true + }.merge(options) render :partial => 'attachments/links', :locals => { :container => container, - :attachments => container.attachments, + :attachments => attachments, :options => options, :thumbnails => (options[:thumbnails] && Setting.thumbnails_enabled?) } diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index cc54b0137..001a038db 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -2,7 +2,7 @@ <div class="contextual"> <%= link_to image_tag('edit.png'), container_attachments_edit_path(container), - :title => l(:label_edit_attachments) if attachments.any?(&:editable?) %> + :title => l(:label_edit_attachments) if options[:editable] %> </div> <% for attachment in attachments %> <p><%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%> |