diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 25fcdf2af71a50fcc316b5e98d49138525924ae6..b93a9f059eac06929112d0f07877370c7eaee56f 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -2,14 +2,15 @@ class PeopleController < ApplicationController before_filter :authenticate_user! def index - @people = Person.friends.paginate :page => params[:page], :order => 'created_at DESC' + @people = current_user.friends.paginate :page => params[:page], :order => 'created_at DESC' end def show @person= Person.where(:id => params[:id]).first + @person_profile = @person.profile @person_posts = Post.where(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC' - @latest_status_message = StatusMessage.newest(@person) + @latest_status_message = StatusMessage.newest_for(@person) @post_count = @person_posts.count end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 69011b563978351fe853b641cf208a305846525f..bd0ede89beec6a4f07eb29735e0f279d95ec7ad9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -31,7 +31,9 @@ module ApplicationHelper end end - def link_to_person(person) + def link_to_person(user) + person = user.person + puts person.inspect link_to person.real_name, person_path(person) end diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb index f59cb78485ed1ad31e4e2f5bb139b461f887b134..dfc4d1c140dcb26d01a66afd445ce79fbc815bed 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -9,7 +9,8 @@ require 'config/environment' # Create seed user -user = User.create( :password => "evankorth", +user = User.create( :email => "robert@joindiaspora.com", + :password => "evankorth", :person => Person.create( :email => "robert@joindiaspora.com", :url => "http://localhost:3000/",