diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index c5f615d20..5d705844b 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -239,7 +239,7 @@ class AttachmentsController < ApplicationController def detect_content_type(attachment, is_thumb = false) content_type = attachment.content_type if content_type.blank? || content_type == "application/octet-stream" - content_type = + content_type = Redmine::MimeType.of(attachment.filename).presence || "application/octet-stream" end diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb index 716d27cae..e431ab0de 100644 --- a/app/controllers/previews_controller.rb +++ b/app/controllers/previews_controller.rb @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class PreviewsController < ApplicationController - before_action :find_project, :except => :text + before_action :find_project, :except => :text before_action :find_attachments def issue diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 369677e3c..11e843099 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -36,7 +36,7 @@ module MembersHelper s + content_tag('span', links, :class => 'pagination') end - # Returns inheritance information for an inherited member role + # Returns inheritance information for an inherited member role def render_role_inheritance(member, role) content = member.role_inheritance(role).map do |h| if h.is_a?(Project) @@ -45,7 +45,7 @@ module MembersHelper l(:label_inherited_from_group, :name => h.name.to_s) end end.compact.uniq - + if content.present? content_tag('span', content.join(", "), :class => "info") end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index a8eb3b3d2..5ba88a60b 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -63,7 +63,7 @@ module SearchHelper :all_words => params[:all_words], :scope => params[:scope], t => 1) end ('