Commit 54d248e5857b7bfd992bed13c1eaf4908304623d
1 parent
e935c71e
Exists in
federation_followers_backend
fix tests, add groups
Showing
4 changed files
with
4 additions
and
3 deletions
Show diff stats
app/models/add_member.rb
... | ... | @@ -22,7 +22,7 @@ class AddMember < Task |
22 | 22 | self.roles = [Profile::Roles.member(organization.environment.id).id] |
23 | 23 | end |
24 | 24 | target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)}) |
25 | - person.follow(organization) | |
25 | + person.follow(organization, 'member_of') | |
26 | 26 | end |
27 | 27 | |
28 | 28 | def title | ... | ... |
app/models/favorite_enterprise_person.rb
app/models/profile.rb
... | ... | @@ -773,7 +773,7 @@ private :generate_url, :url_options |
773 | 773 | else |
774 | 774 | self.affiliate(person, Profile::Roles.admin(environment.id), attributes) if members.count == 0 |
775 | 775 | self.affiliate(person, Profile::Roles.member(environment.id), attributes) |
776 | - person.follow(self) | |
776 | + person.follow(self, 'member_of') | |
777 | 777 | end |
778 | 778 | person.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == self.id }.each { |invite| invite.cancel } |
779 | 779 | remove_from_suggestion_list person | ... | ... |
test/unit/person_notifier_test.rb
... | ... | @@ -198,6 +198,7 @@ class PersonNotifierTest < ActiveSupport::TestCase |
198 | 198 | 'friend_url' => '/', 'friend_profile_custom_icon' => [], 'friend_name' => ['joe'], |
199 | 199 | 'resource_name' => ['resource'], 'resource_profile_custom_icon' => [], 'resource_url' => ['/'], |
200 | 200 | 'enterprise_name' => 'coop', 'enterprise_url' => '/coop', |
201 | + 'follower_url' => '/', 'follower_profile_custom_icon' => [], 'follower_name' => ['joe'], | |
201 | 202 | 'view_url'=> ['/'], 'thumbnail_path' => ['1'], |
202 | 203 | } |
203 | 204 | a.get_url = '' | ... | ... |