Skip to content

Commit

Permalink
Fixes specs on user controller (linked to issue publify#230)
Browse files Browse the repository at this point in the history
I had to commit first to stash many changes without losing my feature. Then I was able to run specs.
  • Loading branch information
Frédéric de Villamil committed Sep 9, 2013
1 parent 353cdbb commit a1bdd25
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions app/controllers/admin/profiles_controller.rb
Expand Up @@ -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
Expand Down

0 comments on commit a1bdd25

Please sign in to comment.