jro_apps/redmine Commit - r13553:e04c819895cd

Don't check if attachments are editable individually....

Jean-Philippe Lang -

r13553:e04c819895cd

parent child

Context file:

r13553:e04c819895cd

Collapse all files

app/helpers/attachments_helper.rb +8 -3

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module AttachmentsHelper
               def container_attachments_edit_path(container)
                 object_attachments_edit_path container.class.name.underscore.pluralize, container.id
               end
               def container_attachments_path(container)
                 object_attachments_path container.class.name.underscore.pluralize, container.id
               end
               # Displays view/delete links to the attachments of the given object
               # Options:
               #   :author -- author names are not displayed if set to false
               #   :thumbails -- display thumbnails if enabled in settings
               def link_to_attachments(container, options = {})
                 options.assert_valid_keys(:author, :thumbnails)
-                if container.attachments.any?
+                attachments = container.attachments.preload(:author).to_a
-                  options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
+                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?)
                     }
                 end
               end
               def render_api_attachment(attachment, api)
                 api.attachment do
                   api.id attachment.id
                   api.filename attachment.filename
                   api.filesize attachment.filesize
                   api.content_type attachment.content_type
                   api.description attachment.description
                   api.content_url download_named_attachment_url(attachment, attachment.filename)
                   if attachment.thumbnailable?
                     api.thumbnail_url thumbnail_url(attachment)
                   end
                   api.author(:id => attachment.author.id, :name => attachment.author.name) if attachment.author
                   api.created_on attachment.created_on
                 end
               end
             end

app/views/attachments/_links.html.erb +1 -1

             <div class="attachments">
             <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 -%>
               <% if attachment.is_text? %>
                 <%= link_to image_tag('magnifier.png'),
                             :controller => 'attachments', :action => 'show',
                             :id => attachment, :filename => attachment.filename %>
               <% end %>
               <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
               <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
               <% if options[:deletable] %>
                 <%= link_to image_tag('delete.png'), attachment_path(attachment),
                                                      :data => {:confirm => l(:text_are_you_sure)},
                                                      :method => :delete,
                                                      :class => 'delete',
                                                      :title => l(:button_delete) %>
               <% end %>
               <% if options[:author] %>
                 <span class="author"><%= h(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
               <% end %>
               </p>
             <% end %>
             <% if defined?(thumbnails) && thumbnails %>
               <% images = attachments.select(&:thumbnailable?) %>
               <% if images.any? %>
               <div class="thumbnails">
                 <% images.each do |attachment| %>
                   <div><%= thumbnail_tag(attachment) %></div>
                 <% end %>
               </div>
               <% end %>
             <% end %>
             </div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages