Download as
Browse Code »

Commit 8c4e4f4bdd1f1c6d9b9c6b717962b6274e7223d0

Authored by Larissa Reis
1 parent 06cb2c65
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

invite-members: refactor cancelation of invitations after membership 

  Refactor commit 737f856ef88a810583886ab402e1267e098c54d8.

(ActionItem3100)
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
app/models/invite_member.rb
  Diff comments   View file @8c4e4f4
@@ -13,7 +13,7 @@ class InviteMember < Invitation @@ -13,7 +13,7 @@ class InviteMember < Invitation
13 end 13 end
14 14
15 def perform 15 def perform
16 - community.add_member(friend) and friend.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == community_id }.each { |invite| invite.cancel } 16 + community.add_member(friend)
17 end 17 end
18 18
19 def title 19 def title
app/models/profile.rb
  Diff comments   View file @8c4e4f4
@@ -618,6 +618,7 @@ private :generate_url, :url_options @@ -618,6 +618,7 @@ private :generate_url, :url_options
618 self.affiliate(person, Profile::Roles.admin(environment.id)) if members_count == 0 618 self.affiliate(person, Profile::Roles.admin(environment.id)) if members_count == 0
619 self.affiliate(person, Profile::Roles.member(environment.id)) 619 self.affiliate(person, Profile::Roles.member(environment.id))
620 end 620 end
  621 + person.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == self.id }.each { |invite| invite.cancel }
621 else 622 else
622 raise _("%s can't have members") % self.class.name 623 raise _("%s can't have members") % self.class.name
623 end 624 end