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

you dont have a pending request from everyone

Browse source
This commit is contained in:
maxwell 2010-12-02 16:09:17 -08:00
parent 3688b3982f
commit 2fbf2ddd6f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/people_controller.rb
View file

@ -12,7 +12,7 @@ class PeopleController < ApplicationController
@aspect = :search
@people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC'
@requests = Request.all(:to_id.in => @people.map{|p| p.id})
@requests = Request.all(:to_id.in => @people.map{|p| p.id}, :from_id => current_user.person.id)
#only do it if it is an email address
if params[:q].try(:match, Devise.email_regexp)