From dc33677965f0c7ab085395ca2ac305dbe2093160 Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Fri, 18 Jul 2014 12:30:25 -0300 Subject: [PATCH] invite-members: refactor cancelation of invitations after membership --- app/models/invite_member.rb | 2 +- app/models/profile.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/invite_member.rb b/app/models/invite_member.rb index b4c252f..884b40c 100644 --- a/app/models/invite_member.rb +++ b/app/models/invite_member.rb @@ -13,7 +13,7 @@ class InviteMember < Invitation end def perform - community.add_member(friend) and friend.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == community_id }.each { |invite| invite.cancel } + community.add_member(friend) end def title diff --git a/app/models/profile.rb b/app/models/profile.rb index 1506d8d..b14e593 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -629,6 +629,7 @@ private :generate_url, :url_options self.affiliate(person, Profile::Roles.admin(environment.id)) if members.count == 0 self.affiliate(person, Profile::Roles.member(environment.id)) end + person.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == self.id }.each { |invite| invite.cancel } else raise _("%s can't have members") % self.class.name end -- libgit2 0.21.2