diaspora/app/controllers/users_controller.rb
ilya 55b4d4758f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
2010-08-17 22:58:46 -07:00

27 lines
631 B
Ruby

class UsersController < ApplicationController
before_filter :authenticate_user!, :except => [:new, :create]
def show
@user= User.first(:id => params[:id])
@user_profile = @user.person.profile
end
def edit
@user = User.first(:id => params[:id])
@profile = @user.profile
@photos = Photo.paginate :page => params[:page], :order => 'created_at DESC'
end
def update
@user = User.where(:id => params[:id]).first
if @user.update_profile(params[:user])
flash[:notice] = "Successfully updated user."
redirect_to @user
else
render :action => 'edit'
end
end
end