From e3c28c4fee0aed444cd095f4367f9c872ba8fafb Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Mon, 2 Aug 2010 21:31:14 -0700
Subject: [PATCH] Fixed Photos, and Carrierwave initializer
---
app/models/photo.rb | 2 +-
app/uploaders/image_uploader.rb | 6 +++---
config/initializers/carrierwave.rb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 7176ecbd68..cc9f3c4120 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -20,7 +20,7 @@ class Photo < Post
photo = Photo.new(params)
photo.image.store! image_file
- photo
+ photo.save
end
after_save :log_save_inspection
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index af157647d9..e118e0f844 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -11,9 +11,9 @@ class ImageUploader < CarrierWave::Uploader::Base
%w(jpg jpeg gif png)
end
- def filename
- model.id.to_s + File.extname(@filename)
- end
+# def filename
+# model.id.to_s + File.extname(@filename)
+# end
version :thumb_small do
process :resize_to_fill => [30,30]
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index cdcfe077fb..ed6e8bb4ec 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,6 +1,6 @@
CarrierWave.configure do |config|
- config.grid_fs_database = "#diaspora-#{Rails.env}"
- config.grid_fs_host = 'localhost'
+ config.grid_fs_database = MongoMapper::database.name
+ config.grid_fs_host = MongoMapper::connection.host
config.grid_fs_access_url = "/images"
config.storage = :grid_fs
#config.storage = :file
--
GitLab