nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sort contacts by name, not by a potentially nil field

Browse source
This commit is contained in:
danielgrippi 2011-03-23 10:16:55 -07:00
parent 4ff67b0200
commit 43315e14f9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/aspects_controller.rb
View file

@ -104,7 +104,7 @@ class AspectsController < ApplicationController
def edit def edit
@aspect = current_user.aspects.where(:id => params[:id]).includes(:contacts => {:person => :profile}).first @aspect = current_user.aspects.where(:id => params[:id]).includes(:contacts => {:person => :profile}).first
@contacts = current_user.contacts.includes(:person => :profile).all.sort!{|x, y| x.person.profile.first_name <=> y.person.profile.first_name }.reverse! @contacts = current_user.contacts.includes(:person => :profile).all.sort!{|x, y| x.person.name <=> y.person.name}.reverse!
unless @aspect unless @aspect
render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404 render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
else else

5
spec/controllers/aspects_controller_spec.rb
View file

@ -287,6 +287,9 @@ describe AspectsController do
before do before do
@bob = bob @bob = bob
@eve = eve @eve = eve
@eve.profile.first_name = nil
@eve.profile.save
@eve.save
end end
it 'renders' do it 'renders' do
get :edit, :id => @alices_aspect_1.id get :edit, :id => @alices_aspect_1.id
@ -297,7 +300,7 @@ describe AspectsController do
connect_users(@alice, @alices_aspect_1, @eve, @eve.aspects.first) connect_users(@alice, @alices_aspect_1, @eve, @eve.aspects.first)
get :edit, :id => @alices_aspect_1.id get :edit, :id => @alices_aspect_1.id
assigns[:contacts].should == [@alice.contact_for(@bob.person), @alice.contact_for(@eve.person)] assigns[:contacts].should == [@alice.contact_for(@eve.person), @alice.contact_for(@bob.person)]
end end
end end