Skip to content
Extraits de code Groupes Projets
Valider 544f7f08 rédigé par maxwell's avatar maxwell
Parcourir les fichiers

MS IZ doesn't delete from pending friends since there is nothing in it

parent 7be374ac
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -37,7 +37,6 @@ class Request ...@@ -37,7 +37,6 @@ class Request
def activate_friend def activate_friend
from_user = Person.first(:url => self.callback_url).owner from_user = Person.first(:url => self.callback_url).owner
from_user.pending_friends.delete(person)
from_user.friends << person from_user.friends << person
from_user.save from_user.save
......
...@@ -71,6 +71,7 @@ class User ...@@ -71,6 +71,7 @@ class User
else else
friend_request.person.save friend_request.person.save
pending_friends << friend_request.person pending_friends << friend_request.person
save
Rails.logger.info("#{self.real_name} has received a friend request") Rails.logger.info("#{self.real_name} has received a friend request")
friend_request.save friend_request.save
end end
......
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