From a1bdd255af71c6128bbefded30d70ea3a96f29bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20de=20Villamil?= Date: Mon, 9 Sep 2013 20:26:44 +0200 Subject: [PATCH] Fixes specs on user controller (linked to issue #230) I had to commit first to stash many changes without losing my feature. Then I was able to run specs. --- app/controllers/admin/profiles_controller.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/profiles_controller.rb b/app/controllers/admin/profiles_controller.rb index 206f4a522b..80b0b352e9 100644 --- a/app/controllers/admin/profiles_controller.rb +++ b/app/controllers/admin/profiles_controller.rb @@ -6,11 +6,13 @@ def index @profiles = Profile.find(:all, :order => 'id') @user.attributes = params[:user] if request.post? - avatar = upload_avatar if params[:user][:filename] - @user.avatar = avatar.upload.avatar.url - @user.thumb_avatar = avatar.upload.thumb.url - @user.medium_avatar = avatar.upload.medium.url - @user.large_avatar = avatar.upload.url + if params[:user][:filename] + avatar = upload_avatar + @user.avatar = avatar.upload.avatar.url + @user.thumb_avatar = avatar.upload.thumb.url + @user.medium_avatar = avatar.upload.medium.url + @user.large_avatar = avatar.upload.url + end if @user.save current_user = @user