From e45a3503d056a5e0e2056860ecd2e17f8b8d61eb Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Tue, 22 Mar 2011 17:23:23 -0700
Subject: [PATCH] on aspect edit the contacts are now sorted by first name

---
 app/controllers/aspects_controller.rb       |  2 +-
 db/seeds.rb                                 |  6 +++---
 spec/controllers/aspects_controller_spec.rb | 11 +++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index ed2d1faa1..19ccd919e 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -104,7 +104,7 @@ class AspectsController < ApplicationController
 
   def edit
     @aspect = current_user.aspects.where(:id => params[:id]).includes(:contacts => {:person => :profile}).first
-    @contacts = current_user.contacts.includes(:person => :profile)
+    @contacts = current_user.contacts.includes(:person => :profile).all.sort!{|x, y| x.person.profile.first_name <=> y.person.profile.first_name }.reverse!
     unless @aspect
       render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
     else
diff --git a/db/seeds.rb b/db/seeds.rb
index 60211460c..31c18380f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -26,6 +26,6 @@ eve.person.profile.update_attributes(:first_name => "Eve", :last_name => "Doe")
 connect_users(bob, bob.aspects.first, alice, alice.aspects.first)
 connect_users(bob, bob.aspects.first, eve, eve.aspects.first)
 
-alice.services << Services::Facebook.create(:user_id => alice.id, :uid => 'a1')
-bob.services << Services::Facebook.create(:user_id => bob.id, :uid => 'b2')
-eve.services << Services::Facebook.create(:user_id => eve.id, :uid => 'e3')
+alice.services << Services::Facebook.create(:user_id => alice.id, :uid => 'a1', :access_token => "secret 1")
+bob.services << Services::Facebook.create(:user_id => bob.id, :uid => 'b2', :access_token => "secret 2")
+eve.services << Services::Facebook.create(:user_id => eve.id, :uid => 'e3', :access_token => "secret 3")
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index e1b421951..9a7f6ce21 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -284,10 +284,21 @@ describe AspectsController do
   end
 
   describe '#edit' do
+    before do
+      @bob = bob
+      @eve = eve
+    end
     it 'renders' do
       get :edit, :id => @alices_aspect_1.id
       response.should be_success
     end
+
+    it 'assigns the contacts in alphabetical order' do
+      connect_users(@alice, @alices_aspect_1, @eve, @eve.aspects.first)
+      
+      get :edit, :id => @alices_aspect_1.id
+      assigns[:contacts].should  == [@alice.contact_for(@bob.person), @alice.contact_for(@eve.person)]
+    end
   end
 
   describe "#toggle_contact_visibility" do