jro_apps/redmine Commit - r15027:3e776af8066e

Don't force download of PDF (#22483)....

Jean-Philippe Lang -

r15027:3e776af8066e

parent child

Context file:

r15027:3e776af8066e

app/controllers/attachments_controller.rb +9 -1

                   # images are sent inline
                   send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                   :type => detect_content_type(@attachment),
-                                                  :disposition => (@attachment.image? ? 'inline' : 'attachment')
+                                                  :disposition => disposition(@attachment)
                 end
               end
                 end
                 content_type.to_s
               end
+              def disposition(attachment)
+                if attachment.is_image? || attachment.is_pdf?
+                  'inline'
+                else
+                  'attachment'
+                end
+              end
             end

app/controllers/repositories_controller.rb +9 -1

                   send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
                   send_type = Redmine::MimeType.of(@path)
                   send_opt[:type] = send_type.to_s if send_type
-                  send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) ? 'inline' : 'attachment')
+                  send_opt[:disposition] = disposition(@path)
                   send_data @repository.cat(@path, @rev), send_opt
                 else
                   if !@entry.size || @entry.size <= Setting.file_max_size_displayed.to_i.kilobyte
                 )
                 graph.burn
               end
+              def disposition(path)
+                if Redmine::MimeType.is_type?('image', @path) || Redmine::MimeType.of(@path) == "application/pdf"
+                  'inline'
+                else
+                  'attachment'
+                end
+              end
             end

app/models/attachment.rb +4 0

                 self.filename =~ /\.(patch|diff)$/i
               end
+              def is_pdf?
+                Redmine::MimeType.of(filename) == "application/pdf"
+              end
               # Returns true if the file is readable
               def readable?
                 File.readable?(diskfile)

General Comments 0

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

No TODOs yet

	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