Download as
Browse Code »

Commit 723a60610bcf91ad1ef512e50a013c239a71f12f

Authored by Braulio Bhavamitra
2 parents 6781aeb3 24083e66
Exists in web_steps_improvements and in 8 other branches add_member_task_reject_details, admin_visible_profile, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.5

Merge branch 'thumb-fail' into 'master' 

Makes max_size uniform between UploadedFile and Thumbnail

closes #152

See merge request !804
Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
app/models/thumbnail.rb
  Diff comments   View file @723a606
... ... @@ -5,7 +5,7 @@ class Thumbnail < ActiveRecord::Base
5 5 attr_accessible :content_type, :filename, :thumbnail_resize_options, :thumbnail, :parent_id
6 6  
7 7 has_attachment :storage => :file_system,
8   - :content_type => :image, :max_size => 5.megabytes, processor: 'Rmagick'
  8 + :content_type => :image, :max_size => UploadedFile.max_size, processor: 'Rmagick'
9 9 validates_as_attachment
10 10  
11 11 sanitize_filename
... ...
db/migrate/20160309120350_generate_missed_thumbnails.rb 0 → 100644
  Diff comments   View file @723a606
... ... @@ -0,0 +1,5 @@
  1 +class GenerateMissedThumbnails < ActiveRecord::Migration
  2 + def up
  3 + UploadedFile.find_each {|f| f.create_thumbnails if f.thumbnails.empty? }
  4 + end
  5 +end
... ...