Download as
Browse Code »

Commit 8c4e4f4bdd1f1c6d9b9c6b717962b6274e7223d0

Authored by Larissa Reis
1 parent 06cb2c65
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

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 13 end
14 14  
15 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 17 end
18 18  
19 19 def title
... ...
app/models/profile.rb
  Diff comments   View file @8c4e4f4
... ... @@ -618,6 +618,7 @@ private :generate_url, :url_options
618 618 self.affiliate(person, Profile::Roles.admin(environment.id)) if members_count == 0
619 619 self.affiliate(person, Profile::Roles.member(environment.id))
620 620 end
  621 + person.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == self.id }.each { |invite| invite.cancel }
621 622 else
622 623 raise _("%s can't have members") % self.class.name
623 624 end
... ...