Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-14 17:26:06 +01:00
Code Issues Packages Projects Releases Activity

Merged r16285 (#24199).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16294 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-29 10:39:34 +00:00
parent 730f1c3071
commit 46e11396b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/attachments_controller.rb
View File

@@ -197,7 +197,7 @@ class AttachmentsController < ApplicationController
end end
def disposition(attachment) def disposition(attachment)
if attachment.is_image? || attachment.is_pdf? if attachment.is_pdf?
'inline' 'inline'
else else
'attachment' 'attachment'

2
app/controllers/repositories_controller.rb
View File

@@ -443,7 +443,7 @@ class RepositoriesController < ApplicationController
end end
def disposition(path) def disposition(path)
if Redmine::MimeType.is_type?('image', @path) || Redmine::MimeType.of(@path) == "application/pdf" if Redmine::MimeType.of(@path) == "application/pdf"
'inline' 'inline'
else else
'attachment' 'attachment'