this should fix the getting started, going to test on staging first

This commit is contained in:
zhitomirskiyi 2011-03-23 11:03:08 -07:00
parent dd11edf033
commit 1cfba68416
2 changed files with 5 additions and 6 deletions

View file

@ -101,9 +101,9 @@ class UsersController < ApplicationController
if @step == 3
@requests = Request.where(:recipient_id => @person.id).includes(:sender => :profile).all
@friends = service ? service.finder(:local => true) : {}
@friends ||= {}
@friends.delete_if{|key, value| @requests.any?{ |r| r.sender_id == value[:person].id} }
@friends = service ? service.finder(:local => true) : []
@friends ||= []
@friends.delete_if{|f| @requests.any?{ |r| r.sender_id == f.person.id} }
end

View file

@ -15,9 +15,8 @@
- person = pending_req.sender
= render :partial => 'people/person', :locals => {:request => pending_req, :person => person, :contact => nil}
- for fb_id in @friends.keys
- friend = @friends[fb_id]
= render :partial => 'people/person', :locals => {:request => friend[:request], :person => friend[:person], :contact => friend[:contact]}
- for friend in @friends
= render :partial => 'people/person', :locals => {:request => friend.request, :person => friend.person, :contact => friend.contact}
%br
%br