[Git][noosfero/noosfero][master] 3 commits: Makes max_size uniform between UploadedFile and Thumbnail

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
e50ba061 by Aurélio A. Heckert at 2016-03-08T22:19:49-03:00
Makes max_size uniform between UploadedFile and Thumbnail

closes #152

- - - - -
24083e66 by Aurélio A. Heckert at 2016-03-09T12:10:11-03:00
Add migration to generate missed thumbnails

- - - - -
723a6061 by Bráulio Bhavamitra at 2016-03-24T21:35:14+00:00
Merge branch 'thumb-fail' into 'master'

Makes max_size uniform between UploadedFile and Thumbnail

closes #152

See merge request !804
- - - - -


2 changed files:

- app/models/thumbnail.rb
- + db/migrate/20160309120350_generate_missed_thumbnails.rb


Changes:

=====================================
app/models/thumbnail.rb
=====================================
--- a/app/models/thumbnail.rb
+++ b/app/models/thumbnail.rb
@@ -5,7 +5,7 @@ class Thumbnail < ActiveRecord::Base
   attr_accessible :content_type, :filename, :thumbnail_resize_options, :thumbnail, :parent_id
 
   has_attachment :storage => :file_system,
-    :content_type => :image, :max_size => 5.megabytes, processor: 'Rmagick'
+    :content_type => :image, :max_size => UploadedFile.max_size, processor: 'Rmagick'
   validates_as_attachment
 
   sanitize_filename


=====================================
db/migrate/20160309120350_generate_missed_thumbnails.rb
=====================================
--- /dev/null
+++ b/db/migrate/20160309120350_generate_missed_thumbnails.rb
@@ -0,0 +1,5 @@
+class GenerateMissedThumbnails < ActiveRecord::Migration
+  def up
+    UploadedFile.find_each {|f| f.create_thumbnails if f.thumbnails.empty? }
+  end
+end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/6781aeb365503606813c0320665819917a51abbf...723a60610bcf91ad1ef512e50a013c239a71f12f
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160324/6cc95032/attachment-0001.html>