jro_apps/redmine Commit - r3144:ff7eb7b23a6a

Auto-detect attachment content type when blank (#3782)....

Jean-Philippe Lang -

r3144:ff7eb7b23a6a

parent child

Context file:

r3144:ff7eb7b23a6a

Collapse all files

app/controllers/attachments_controller.rb +9 -1

                 # images are sent inline
                 send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                                                :type => @attachment.content_type,
+                                                :type => detect_content_type(@attachment),
                                                 :disposition => (@attachment.image? ? 'inline' : 'attachment')
               end
               def delete_authorize
                 @attachment.deletable? ? true : deny_access
               end
+              def detect_content_type(attachment)
+                content_type = attachment.content_type
+                if content_type.blank?
+                  content_type = Redmine::MimeType.of(attachment.filename)
+                end
+                content_type
+              end
             end

app/models/attachment.rb +3 0

                     self.filename = sanitize_filename(@temp_file.original_filename)
                     self.disk_filename = Attachment.disk_filename(filename)
                     self.content_type = @temp_file.content_type.to_s.chomp
+                    if content_type.blank?
+                      self.content_type = Redmine::MimeType.of(filename)
+                    end
                     self.filesize = @temp_file.size
                   end
                 end

lib/redmine/mime_type.rb +17 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2009  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
                   'text/x-sh' => 'sh',
                   'text/xml' => 'xml,xsd,mxml',
                   'text/yaml' => 'yml,yaml',
+                  'text/csv' => 'csv',
                   'image/gif' => 'gif',
                   'image/jpeg' => 'jpg,jpeg,jpe',
                   'image/png' => 'png',
                   'image/x-ms-bmp' => 'bmp',
                   'image/x-xpixmap' => 'xpm',
                   'application/pdf' => 'pdf',
+                  'application/rtf' => 'rtf',
+                  'application/msword' => 'doc',
+                  'application/vnd.ms-excel' => 'xls',
+                  'application/vnd.ms-powerpoint' => 'ppt,pps',
+                  'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'docx',
+                  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
+                  'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx',
+                  'application/vnd.openxmlformats-officedocument.presentationml.slideshow' => 'ppsx',
+                  'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
+                  'application/vnd.oasis.opendocument.text' => 'odt',
+                  'application/vnd.oasis.opendocument.presentation' => 'odp',
+                  'application/x-7z-compressed' => '7z',
+                  'application/x-rar-compressed' => 'rar',
+                  'application/x-tar' => 'tar',
                   'application/zip' => 'zip',
                   'application/x-gzip' => 'gz',
                 }.freeze

lib/tasks/migrate_from_trac.rake +1 -1

                     end
                     def content_type
-                      Redmine::MimeType.of(filename) || ''
+                      ''
                     end
                     def exist?

test/functional/attachments_controller_test.rb +8 0

                 assert_equal 'application/x-ruby', @response.content_type
               end
+              def test_download_should_assign_content_type_if_blank
+                Attachment.find(4).update_attribute(:content_type, '')
+                get :download, :id => 4
+                assert_response :success
+                assert_equal 'text/x-ruby', @response.content_type
+              end
               def test_download_missing_file
                 get :download, :id => 2
                 assert_response 404

test/unit/attachment_test.rb +8 0

                 assert File.exist?(a.diskfile)
               end
+              def test_create_should_auto_assign_content_type
+                a = Attachment.new(:container => Issue.find(1),
+                                   :file => uploaded_test_file("testfile.txt", ""),
+                                   :author => User.find(1))
+                assert a.save
+                assert_equal 'text/plain', a.content_type
+              end
               def test_diskfilename
                 assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
                 assert_equal 'test_file.txt', Attachment.disk_filename("test_file.txt")[13..-1]

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