diaspora/app/controllers/users_controller.rb
Raphael f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/sprinkle/provision.rb
2010-08-19 16:09:08 -07:00

37 lines
921 B
Ruby

class UsersController < ApplicationController
before_filter :authenticate_user!, :except => [:new, :create]
def index
@groups_array = current_user.groups.collect{|x| [x.to_s, x.id]}
unless params[:q]
@people = Person.all
render :index
else
@people = Person.search(params[:q])
end
end
def show
@user= User.first(:id => params[:id])
@user_profile = @user.person.profile
end
def edit
@user = User.first(:id => params[:id])
@person = @user.person
@profile = @user.profile
@photos = Photo.where(:person_id => @person.id).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 your profile"
redirect_to @user.person
else
render :action => 'edit'
end
end
end