Skip to content
Extraits de code Groupes Projets
Valider 1cfba684 rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

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

parent dd11edf0
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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
......
......@@ -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
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter