on aspect edit the contacts are now sorted by first name
This commit is contained in:
parent
0cab18d5aa
commit
e45a3503d0
3 changed files with 15 additions and 4 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue