Skip to content
Extraits de code Groupes Projets
Valider 6be63b88 rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

added the pending request to the finder

parent 80117d8a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Chargement en cours
...@@ -2,8 +2,15 @@ ...@@ -2,8 +2,15 @@
.right .right
-if friend[:contact] && !friend[:contact].pending -if friend[:contact] && !friend[:contact].pending
= t('people.person.already_connected') = t('people.person.already_connected')
- elsif (friend[:contact] && friend[:contact].pending) - elsif (friend[:contact] && friend[:contact].pending) || (friend[:request] && friend[:request].sender != friend[:person])
= t('people.person.pending_request') = t('people.person.pending_request')
- elsif (friend[:request] && friend[:request].sender == friend[:person])
= link_to t('people.show.incoming_request', :name => truncate(person.name, :length => 20, :separator => ' ', :omission => '')),
{:controller => "people",
:action => "show",
:id => friend[:person].id,
:share_with => true},
:class => 'button'
- elsif friend[:invitation_id] - elsif friend[:invitation_id]
= t('invitations.new.already_invited') = t('invitations.new.already_invited')
%br %br
......
...@@ -86,13 +86,26 @@ JSON ...@@ -86,13 +86,26 @@ JSON
@service.finder["#{@user2_fb_id}"][:person].should be_nil @service.finder["#{@user2_fb_id}"][:person].should be_nil
end end
it 'contains a request object if one has been sent' do context "request" do
request = Request.diaspora_initialize(:from => @user2.person, :to => @user.person, :into => @user2.aspects.first) before do
Postzord::Receiver.new(@user, :object => request, :person => @user2.person).receive_object @request = Request.diaspora_initialize(:from => @user2.person, :to => @user.person, :into => @user2.aspects.first)
Request.count.should == 1 Postzord::Receiver.new(@user, :object => @request, :person => @user2.person).receive_object
@service.finder["#{@user2_fb_id}"][:request].should == request Request.count.should == 1
end
it 'contains a request object if one has been sent' do
@service.finder["#{@user2_fb_id}"][:request].should == @request
end
it 'caches the profile' do
@service.finder["#{@user2_fb_id}"][:request].sender.profile.loaded?.should be_true
end
it 'caches the sender' do
@service.finder["#{@user2_fb_id}"][:request].sender.loaded?.should be_true
end
end end
it 'contains a contact object if connected' do it 'contains a contact object if connected' do
connect_users(@user, @user.aspects.first, @user2, @user2.aspects.first) connect_users(@user, @user.aspects.first, @user2, @user2.aspects.first)
@service.finder["#{@user2_fb_id}"][:contact].should == @user.reload.contact_for(@user2.person) @service.finder["#{@user2_fb_id}"][:contact].should == @user.reload.contact_for(@user2.person)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter