fix conflit with add_members_community

Leandro Santos
2 parents 9549e2e0 31850513
Showing 6 changed files with 58 additions and 38 deletions Show diff stats
app/helpers/application_helper.rb
app/models/profile.rb
lib/add_members_job.rb
public/stylesheets/application.css
test/functional/invite_controller_test.rb
vendor/plugins/access_control/lib/acts_as_accessible.rb
@@ -606,24 +606,14 @@ module ApplicationHelper
         trigger_class = 'enterprise-trigger'
       end
     end
-
-    extra_info_tag = ''
-    img_class = 'profile-image'
-
-    if extra_info.is_a? Hash
-      extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
-      img_class +=' '+extra_info[:class]
-    else
-      extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
-    end
-    #extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
+    extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
                                    (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
     link_to(
-      content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
+      content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
       content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-      extra_info_tag + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
       profile.url,
       :class => 'profile_link url',
       :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
@@ -735,6 +735,29 @@ private :generate_url, :url_options
     end
   end
+  # Adds many people to profile by id's
+  def add_members_by_id(people_ids)
+
+    unless people_ids.nil? && people_ids.empty?
+
+      people = Person.where(id: people_ids)
+      people.each do |person|
+
+        add_member(person) unless person.is_member_of?(self)
+      end
+    end
+  end
+
+  # Adds many people to profile by email's
+  def add_members_by_email(people_emails)
+
+    people = User.where(email: people_emails)
+    people.each do |user|
+
+      add_member(user.person) unless user.person.is_member_of?(self)
+    end
+  end
+
   def remove_member(person)
     self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
   end
@@ -4,7 +4,12 @@ class AddMembersJob &lt; Struct.new(:people_ids, :profile_id, :locale)
     Noosfero.with_locale(locale) do
       profile = Profile.find(profile_id)
-      profile.add_members people_ids
+
+      if people_ids.first =~ /\@/
+        profile.add_members_by_email people_ids
+      else
+        profile.add_members_by_id people_ids
+      end
     end
   end
@@ -2232,21 +2232,6 @@ a.button.disabled, input.disabled {
 .profile-list .extra_info {
   font-size: 9px;
 }
-
-/* New members of community added
-* by admin of environment feature
-* #issue 227
-*/
-.profile-list .extra_info.new-profile {
-  margin-top: 5px;
-  color: #0A0;
-  font-weight: bold;
-}
-
-span.new-profile img{
-  border-top: solid 2px #0A0;
-  margin-top: -2px;
-}
 /* ==> blocks/recent-documents-block.css <<= */
 #content .recent-documents-block {
@@ -284,11 +284,6 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_empty json_response
   end
-  #@todo Copy this test and create a another version
-  #of this, for test add members in a community
-  #logged as admin of environment!
-  # #issue227
-  #
   should 'invite registered users through profile id' do
     friend1 = create_user('testuser1').person
     friend2 = create_user('testuser2').person
@@ -302,7 +297,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     end
   end
-  should 'add registered users imediatly instead invite if logged user is a environment admin' do
+  should 'add registered users by id imediatly instead invite if logged user is a environment admin' do
     #Add user like a environment admin
     Environment.default.add_admin profile
@@ -313,7 +308,29 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_difference 'Delayed::Job.count', 1 do
       assert_equal 0,community.members.count
-      post :invite_registered_friend, :profile => @community.identifier, :q => [friend1.id,friend2.id]
+      post :invite_registered_friend, :profile => @community.identifier, :q => "#{friend1.id},#{friend2.id}"
+
+      assert_response :redirect
+      assert_redirected_to :controller => 'profile', :action => 'members'
+    end
+
+    Delayed::Worker.new.run(Delayed::Job.last)
+
+    assert_equal 2,community.members.count
+
+  end
+
+  should 'add registered users by email imediatly instead invite if logged user is a environment admin' do
+
+    Environment.default.add_admin profile
+
+    friend1 = create_user('testuser1', {email: 'friend1@test.com.br'})
+    friend2 = create_user('testuser2', {email: 'friend2@test.com.br'})
+
+    assert_difference 'Delayed::Job.count', 1 do
+      assert_equal 0,community.members.count
+
+      post :invite_registered_friend, :profile => @community.identifier, :q => "#{friend1.email},#{friend2.email}"
       assert_response :redirect
       assert_redirected_to :controller => 'profile', :action => 'members'
@@ -19,9 +19,9 @@ module ActsAsAccessible
     nil
   end
-  def affiliate(accessor, roles)
+  def affiliate(accessor, roles, attributes = {})
     roles = [roles] unless roles.kind_of?(Array)
-    roles.map {|role| accessor.add_role(role, self)}.any? 
+    roles.map {|role| accessor.add_role(role, self, attributes)}.any?
   end
   def disaffiliate(accessor, roles)
	@@ -735,6 +735,29 @@ private :generate_url, :url_options		@@ -735,6 +735,29 @@ private :generate_url, :url_options
735	end	735	end
736	end	736	end
737		737
		738	+ # Adds many people to profile by id's
		739	+ def add_members_by_id(people_ids)
		740	+
		741	+ unless people_ids.nil? && people_ids.empty?
		742	+
		743	+ people = Person.where(id: people_ids)
		744	+ people.each do \|person\|
		745	+
		746	+ add_member(person) unless person.is_member_of?(self)
		747	+ end
		748	+ end
		749	+ end
		750	+
		751	+ # Adds many people to profile by email's
		752	+ def add_members_by_email(people_emails)
		753	+
		754	+ people = User.where(email: people_emails)
		755	+ people.each do \|user\|
		756	+
		757	+ add_member(user.person) unless user.person.is_member_of?(self)
		758	+ end
		759	+ end
		760	+
738	def remove_member(person)	761	def remove_member(person)
739	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))	762	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
740	end	763	end
	@@ -2232,21 +2232,6 @@ a.button.disabled, input.disabled {		@@ -2232,21 +2232,6 @@ a.button.disabled, input.disabled {
2232	.profile-list .extra_info {	2232	.profile-list .extra_info {
2233	font-size: 9px;	2233	font-size: 9px;
2234	}	2234	}
2235	-
2236	-/* New members of community added
2237	-* by admin of environment feature
2238	-* #issue 227
2239	-*/
2240	-.profile-list .extra_info.new-profile {
2241	- margin-top: 5px;
2242	- color: #0A0;
2243	- font-weight: bold;
2244	-}
2245	-
2246	-span.new-profile img{
2247	- border-top: solid 2px #0A0;
2248	- margin-top: -2px;
2249	-}
2250	/* ==> blocks/recent-documents-block.css <<= */	2235	/* ==> blocks/recent-documents-block.css <<= */
2251		2236
2252	#content .recent-documents-block {	2237	#content .recent-documents-block {
	@@ -19,9 +19,9 @@ module ActsAsAccessible		@@ -19,9 +19,9 @@ module ActsAsAccessible
19	nil	19	nil
20	end	20	end
21		21
22	- def affiliate(accessor, roles)	22	+ def affiliate(accessor, roles, attributes = {})
23	roles = [roles] unless roles.kind_of?(Array)	23	roles = [roles] unless roles.kind_of?(Array)
24	- roles.map {\|role\| accessor.add_role(role, self)}.any?	24	+ roles.map {\|role\| accessor.add_role(role, self, attributes)}.any?
25	end	25	end
26		26
27	def disaffiliate(accessor, roles)	27	def disaffiliate(accessor, roles)