From 1cfba68416f91707e88819891d61e28a4b43fd2b Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Wed, 23 Mar 2011 11:03:08 -0700
Subject: [PATCH] this should fix the getting started, going to test on staging
first
---
app/controllers/users_controller.rb | 6 +++---
app/views/users/getting_started/_step_3.html.haml | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 935019724a..7f697b90bf 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -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
diff --git a/app/views/users/getting_started/_step_3.html.haml b/app/views/users/getting_started/_step_3.html.haml
index bc3561dada..83edbc25c1 100644
--- a/app/views/users/getting_started/_step_3.html.haml
+++ b/app/views/users/getting_started/_step_3.html.haml
@@ -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
--
GitLab