nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
ilya 2010-08-19 10:49:18 -07:00
commit b723c5997e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/people_controller.rb
View file

@ -14,8 +14,10 @@ class PeopleController < ApplicationController
def show def show
@person = current_user.visible_person_by_id(params[:id]) @person = current_user.visible_person_by_id(params[:id])
@profile = @person.profile @profile = @person.profile
@posts = Post.find_all_by_person_id(@person.id).paginate :page => params[:page], :order => 'created_at DESC'
@latest_status_message = StatusMessage.newest_for(@person) @posts = Post.where(:person_id => @person.id, :_id.in => current_user.visible_post_ids).paginate :page => params[:page], :order => 'created_at DESC'
@latest_status_message = current_user.raw_visible_posts.find_all_by__type_and_person_id("StatusMessage", params[:id]).last
@post_count = @posts.count @post_count = @posts.count
end end

2
app/models/post.rb
View file

@ -31,7 +31,7 @@ class Post
#Querying #Querying
def self.newest_for(person) def self.newest_for(person)
self.first(:person_id => person.id, :order => '_id desc') self.where(:person_id => person.id, :order => '_id desc')
end end
#ENCRYPTION #ENCRYPTION