diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c7e2979b1dedf3281f5e8abddd85de5fb7941124..ac978b55c3053d60f5d8da02a1bd20f75a2d520c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -18,7 +18,7 @@ class UsersController < ApplicationController end def edit - @user = User.first(:id => params[:id]) + @user = current_user @person = @user.person @profile = @user.profile @photos = Photo.where(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC' diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index a0e7d95c60e9f32e458fb1427710b98845ce9dfa..2d972491468af1cd5b6b5f611ab19bc2426b921a 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -1,6 +1,5 @@ module GroupsHelper def link_for_group( group ) - puts request.params link_to group.name, group end end diff --git a/app/models/user.rb b/app/models/user.rb index c4054143170bc42c3e9b0de8b69fb93351ef9de7..5032ef27358462b34b856defccc366d47450d46b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -123,6 +123,8 @@ class User ########### Profile ###################### def update_profile(params) + params[:profile].delete(:image_url) if params[:profile][:image_url].empty? + if self.person.update_attributes(params) self.profile.push_to( self.friends.all ) true