github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 11:54:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add meaningful error message on upload [fixes #773]

Browse Source
This commit is contained in:
Régis Hanol
2013-04-27 20:26:17 +02:00
parent eae2e74152
commit dca2fbcefc
6 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/topic.rb
View File

@ -58,7 +58,6 @@ class Topic < ActiveRecord::Base
attr_accessor :posters # TODO: can replace with posters_summary once we remove old list code
attr_accessor :topic_list
# The regular order
scope :topic_list_order, lambda { order('topics.bumped_at desc') }

4
app/models/upload.rb
View File

@ -40,7 +40,7 @@ class Upload < ActiveRecord::Base
filesize: File.size(tempfile),
original_filename: file.original_filename)
image_info = FastImage.new(tempfile)
image_info = FastImage.new(tempfile, raise_on_failure: true)
blob = file.read
sha1 = Digest::SHA1.hexdigest(blob)
@ -75,7 +75,7 @@ class Upload < ActiveRecord::Base
# populate the rest of the info
clean_name = Digest::SHA1.hexdigest("#{Time.now.to_s}#{file.original_filename}")[0,16]
image_info = FastImage.new(file.tempfile)
image_info = FastImage.new(file.tempfile, raise_on_failure: true)
clean_name += ".#{image_info.type}"
url_root = "/uploads/#{RailsMultisite::ConnectionManagement.current_db}/#{upload.id}"
path = "#{Rails.root}/public#{url_root}"