Make urls not change on processing

2 files changed, 7 insertions, 3 deletions

diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index fb0478c80..a2e8c3658 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -14,7 +14,7 @@ class ProcessedImage < CarrierWave::Uploader::Base
   end
 
   def filename
-    model.random_string + model.id.to_s + File.extname(@filename) if @filename
+    model.random_string + File.extname(@filename) if @filename
   end
 
   version :thumb_small do
diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb
index ab43a3d07..579241253 100644
--- a/app/uploaders/unprocessed_image.rb
+++ b/app/uploaders/unprocessed_image.rb
@@ -6,7 +6,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
   def store_dir
-    "uploads/u_images"
+    "uploads/images"
   end
 
   def extension_white_list
@@ -14,7 +14,11 @@ class UnprocessedImage < CarrierWave::Uploader::Base
   end
 
   def filename
-    model.random_string + model.id.to_s + File.extname(@filename) if @filename
+    model.random_string + File.extname(@filename) if @filename
   end
 
+  version :thumb_small
+  version :thumb_medium
+  version :thumb_large
+  version :scaled_full
 end