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

Fix aspect edit page

Browse source
This commit is contained in:
Raphael 2011-01-17 14:13:17 -08:00
parent 6eb0dfb43f
commit 6410355d71
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/aspects_controller.rb
View file

@ -28,8 +28,7 @@ class AspectsController < ApplicationController
:page => params[:page], :per_page => 15, :order => 'created_at DESC') :page => params[:page], :per_page => 15, :order => 'created_at DESC')
@post_hashes = hashes_for_posts @posts @post_hashes = hashes_for_posts @posts
@contacts = Contact.joins(:aspect_memberships).where( @contacts = current_user.contacts.includes(:person).where(:pending => false)
:aspect_memberships => {:aspect_id => @aspect_ids}, :user_id => current_user.id, :pending => false)
@contact_hashes = hashes_for_contacts @contacts @contact_hashes = hashes_for_contacts @contacts
@aspect_hashes = hashes_for_aspects @aspects, @contacts, :limit => 16 @aspect_hashes = hashes_for_aspects @aspects, @contacts, :limit => 16
@ -84,7 +83,7 @@ class AspectsController < ApplicationController
render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404 render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
else else
@aspect_ids = [@aspect.id] @aspect_ids = [@aspect.id]
@aspect_contacts = hashes_for_contacts Contact.all(:user_id => current_user.id, :aspect_ids.in => [@aspect.id], :pending => false) @aspect_contacts = hashes_for_contacts @aspect.contacts.where(:pending => false).all
@aspect_contacts_count = @aspect_contacts.count @aspect_contacts_count = @aspect_contacts.count
@all_contacts = hashes_for_contacts @contacts @all_contacts = hashes_for_contacts @contacts

12
spec/controllers/aspects_controller_spec.rb
View file

@ -227,16 +227,21 @@ describe AspectsController do
end end
describe "#hashes_for_aspects" do describe "#hashes_for_aspects" do
before do before do
@aspect1 = @user.aspects.create(:name => "SecondAspect")
@people = [] @people = []
10.times {@people << Factory.create(:person)} 10.times {@people << Factory.create(:person)}
@people.each{|p| @user.reload.activate_contact(p, @user.aspects.first.reload)}
@people.each do |p|
@user.reload.activate_contact(p, @user.aspects.first.reload)
@user.add_contact_to_aspect(@user.contact_for(p), @aspect1)
end
@user.reload @user.reload
@hashes = @controller.send(:hashes_for_aspects, @user.aspects, @user.contacts, :limit => 9) @hashes = @controller.send(:hashes_for_aspects, @user.aspects, @user.contacts, :limit => 9)
@hash = @hashes.first @hash = @hashes.first
@aspect0 = @user.aspects.first @aspect0 = @user.aspects.first
end end
it 'has aspects' do it 'has aspects' do
@hashes.length.should == 2 @hashes.length.should == @user.aspects.count
@hash[:aspect].should == @aspect0 @hash[:aspect].should == @aspect0
end end
it 'has a contact_count' do it 'has a contact_count' do
@ -255,6 +260,9 @@ describe AspectsController do
it 'has a contact in each hash' do it 'has a contact in each hash' do
@aspect0.contacts.include?(@hash[:contacts].first[:contact]).should be_true @aspect0.contacts.include?(@hash[:contacts].first[:contact]).should be_true
end end
it 'does not retreive duplicate contacts' do
@hash[:contacts].uniq.count.should == @hash[:contacts].count
end
end end
describe "#update" do describe "#update" do