Merge branch 'I227-add_members_community' into stable

Michel Felipe
2 parents 9f871818 c91330e1
Showing 7 changed files with 121 additions and 11 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/helpers/application_helper.rb
app/models/profile.rb
app/views/profile/members.html.erb
lib/add_members_job.rb
public/stylesheets/application.css
test/functional/invite_controller_test.rb
@@ -62,20 +62,36 @@ class InviteController &lt; PublicController
     redirect_to :action => 'invite_friends'
   end
+  #Invite or add member without create a task
+  #if logged user is admin of environment
   def invite_registered_friend
+
+    if !params['q'].present? || !request.post?
+
+      redirect_to :action => 'invite_friends'
+      session[:notice] = _('Please enter a valid profile.')
+
+      return
+    end
+
     contacts_to_invite = params['q'].split(',')
-    if !contacts_to_invite.empty? && request.post?
+
+    if user.is_admin? && profile.community?
+
+      Delayed::Job.enqueue AddMembersJob.new contacts_to_invite, profile.id, locale
+
+      session[:notice] = _('This friends was added!')
+    else
       Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
       session[:notice] = _('Your invitations are being sent.')
-      if profile.person?
-        redirect_to :controller => 'profile', :action => 'friends'
-      else
-        redirect_to :controller => 'profile', :action => 'members'
-      end
+    end
+
+    if profile.person?
+      redirect_to :controller => 'profile', :action => 'friends'
     else
-      redirect_to :action => 'invite_friends'
-      session[:notice] = _('Please enter a valid profile.')
+      redirect_to :controller => 'profile', :action => 'members'
     end
+
   end
   def search
@@ -589,14 +589,24 @@ module ApplicationHelper
         trigger_class = 'enterprise-trigger'
       end
     end
-    extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
+
+    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' )
     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 => 'profile-image' ) +
+      content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
       content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      extra_info_tag + 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,
@@ -703,6 +703,32 @@ private :generate_url, :url_options
     end
   end
+  # Adds many people to profile by id's or email's
+  def add_members(people_ids)
+
+    unless people_ids.nil? && people_ids.empty?
+      people = []
+
+      if people_ids.first =~ /\@/
+        people = User.where(email: people_ids)
+      else
+        people = Person.where(id: people_ids)
+      end
+
+      people.each do |profile|
+        person = profile
+
+        if profile.is_a? User
+          person = profile.person
+        end
+
+        unless person.is_member_of?(self)
+          add_member person
+        end
+      end
+    end
+  end
+
   def remove_member(person)
     self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
   end
@@ -4,6 +4,10 @@
 <% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
   <ul class='profile-list'>
+    <!--
+     @todo Highlight visual for invited members
+         of a community
+    -->
     <% @members.each do |member| %>
       <%= profile_image_link(member) %>
     <% end %>
@@ -0,0 +1,11 @@
+class AddMembersJob < Struct.new(:people_ids, :profile_id, :locale)
+
+  def perform
+    Noosfero.with_locale(locale) do
+
+      profile = Profile.find(profile_id)
+      profile.add_members people_ids
+
+    end
+  end
+end
@@ -2205,6 +2205,21 @@ 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,6 +284,11 @@ 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
@@ -297,6 +302,29 @@ class InviteControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'add registered users imediatly instead invite if logged user is a environment admin' do
+
+    #Add user like a environment admin
+    Environment.default.add_admin profile
+
+    friend1 = create_user('testuser1').person
+    friend2 = create_user('testuser2').person
+
+    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]
+
+      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
+
   private
   def json_response
	@@ -62,20 +62,36 @@ class InviteController < PublicController		@@ -62,20 +62,36 @@ class InviteController < PublicController
62	redirect_to :action => 'invite_friends'	62	redirect_to :action => 'invite_friends'
63	end	63	end
64		64
		65	+ #Invite or add member without create a task
		66	+ #if logged user is admin of environment
65	def invite_registered_friend	67	def invite_registered_friend
		68	+
		69	+ if !params['q'].present? \|\| !request.post?
		70	+
		71	+ redirect_to :action => 'invite_friends'
		72	+ session[:notice] = _('Please enter a valid profile.')
		73	+
		74	+ return
		75	+ end
		76	+
66	contacts_to_invite = params['q'].split(',')	77	contacts_to_invite = params['q'].split(',')
67	- if !contacts_to_invite.empty? && request.post?	78	+
		79	+ if user.is_admin? && profile.community?
		80	+
		81	+ Delayed::Job.enqueue AddMembersJob.new contacts_to_invite, profile.id, locale
		82	+
		83	+ session[:notice] = _('This friends was added!')
		84	+ else
68	Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)	85	Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
69	session[:notice] = _('Your invitations are being sent.')	86	session[:notice] = _('Your invitations are being sent.')
70	- if profile.person?
71	- redirect_to :controller => 'profile', :action => 'friends'
72	- else
73	- redirect_to :controller => 'profile', :action => 'members'
74	- end	87	+ end
		88	+
		89	+ if profile.person?
		90	+ redirect_to :controller => 'profile', :action => 'friends'
75	else	91	else
76	- redirect_to :action => 'invite_friends'
77	- session[:notice] = _('Please enter a valid profile.')	92	+ redirect_to :controller => 'profile', :action => 'members'
78	end	93	end
		94	+
79	end	95	end
80		96
81	def search	97	def search
	@@ -703,6 +703,32 @@ private :generate_url, :url_options		@@ -703,6 +703,32 @@ private :generate_url, :url_options
703	end	703	end
704	end	704	end
705		705
		706	+ # Adds many people to profile by id's or email's
		707	+ def add_members(people_ids)
		708	+
		709	+ unless people_ids.nil? && people_ids.empty?
		710	+ people = []
		711	+
		712	+ if people_ids.first =~ /\@/
		713	+ people = User.where(email: people_ids)
		714	+ else
		715	+ people = Person.where(id: people_ids)
		716	+ end
		717	+
		718	+ people.each do \|profile\|
		719	+ person = profile
		720	+
		721	+ if profile.is_a? User
		722	+ person = profile.person
		723	+ end
		724	+
		725	+ unless person.is_member_of?(self)
		726	+ add_member person
		727	+ end
		728	+ end
		729	+ end
		730	+ end
		731	+
706	def remove_member(person)	732	def remove_member(person)
707	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))	733	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
708	end	734	end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddMembersJob < Struct.new(:people_ids, :profile_id, :locale)
	2	+
	3	+ def perform
	4	+ Noosfero.with_locale(locale) do
	5	+
	6	+ profile = Profile.find(profile_id)
	7	+ profile.add_members people_ids
	8	+
	9	+ end
	10	+ end
	11	+end
	@@ -2205,6 +2205,21 @@ a.button.disabled, input.disabled {		@@ -2205,6 +2205,21 @@ a.button.disabled, input.disabled {
2205	.profile-list .extra_info {	2205	.profile-list .extra_info {
2206	font-size: 9px;	2206	font-size: 9px;
2207	}	2207	}
		2208	+
		2209	+/* New members of community added
		2210	+* by admin of environment feature
		2211	+* #issue 227
		2212	+*/
		2213	+.profile-list .extra_info.new-profile {
		2214	+ margin-top: 5px;
		2215	+ color: #0A0;
		2216	+ font-weight: bold;
		2217	+}
		2218	+
		2219	+span.new-profile img{
		2220	+ border-top: solid 2px #0A0;
		2221	+ margin-top: -2px;
		2222	+}
2208	/* ==> blocks/recent-documents-block.css <<= */	2223	/* ==> blocks/recent-documents-block.css <<= */
2209		2224
2210	#content .recent-documents-block {	2225	#content .recent-documents-block {
	@@ -284,6 +284,11 @@ class InviteControllerTest < ActionController::TestCase		@@ -284,6 +284,11 @@ class InviteControllerTest < ActionController::TestCase
284	assert_empty json_response	284	assert_empty json_response
285	end	285	end
286		286
		287	+ #@todo Copy this test and create a another version
		288	+ #of this, for test add members in a community
		289	+ #logged as admin of environment!
		290	+ # #issue227
		291	+ #
287	should 'invite registered users through profile id' do	292	should 'invite registered users through profile id' do
288	friend1 = create_user('testuser1').person	293	friend1 = create_user('testuser1').person
289	friend2 = create_user('testuser2').person	294	friend2 = create_user('testuser2').person
	@@ -297,6 +302,29 @@ class InviteControllerTest < ActionController::TestCase		@@ -297,6 +302,29 @@ class InviteControllerTest < ActionController::TestCase
297	end	302	end
298	end	303	end
299		304
		305	+ should 'add registered users imediatly instead invite if logged user is a environment admin' do
		306	+
		307	+ #Add user like a environment admin
		308	+ Environment.default.add_admin profile
		309	+
		310	+ friend1 = create_user('testuser1').person
		311	+ friend2 = create_user('testuser2').person
		312	+
		313	+ assert_difference 'Delayed::Job.count', 1 do
		314	+ assert_equal 0,community.members.count
		315	+
		316	+ post :invite_registered_friend, :profile => @community.identifier, :q => [friend1.id,friend2.id]
		317	+
		318	+ assert_response :redirect
		319	+ assert_redirected_to :controller => 'profile', :action => 'members'
		320	+ end
		321	+
		322	+ Delayed::Worker.new.run(Delayed::Job.last)
		323	+
		324	+ assert_equal 2,community.members.count
		325	+
		326	+ end
		327	+
300	private	328	private
301		329
302	def json_response	330	def json_response