From f861955d8046fe9f3bb9d65f5470495817aa41f5 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Mon, 13 Dec 2010 12:11:54 -0800
Subject: [PATCH] profile.image_url is set to :thumb_large in update_profile
---
app/models/user.rb | 2 +-
spec/models/user_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index b57131607c..b5496f47d0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -304,7 +304,7 @@ class User
def update_profile(params)
if params[:photo]
params[:photo].update_attributes(:pending => false) if params[:photo].pending
- params[:image_url] = params[:photo].url
+ params[:image_url] = params[:photo].url(:thumb_large)
params[:image_url_medium] = params[:photo].url(:thumb_medium)
params[:image_url_small] = params[:photo].url(:thumb_small)
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1e43efc2a6..1af1454ab8 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -296,7 +296,7 @@ describe User do
end
it 'updates image_url' do
user.update_profile(@params).should be_true
- user.reload.profile.image_url.should == @photo.absolute_url
+ user.reload.profile.image_url.should == @photo.absolute_url(:thumb_large)
user.profile.image_url_medium.should == @photo.absolute_url(:thumb_medium)
user.profile.image_url_small.should == @photo.absolute_url(:thumb_small)
end
--
GitLab