Modify invite friend to community feature for add member imediatly, if logged us…

…er is a admin of environment

Modify invite friend to community feature for add member imediatly, if logged us…
…er is a admin of environment
Michel Felipe
1 parent ba467618
Showing 6 changed files with 76 additions and 7 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/models/invitation.rb
app/views/profile/members.html.erb
public/stylesheets/application.css
@@ -62,11 +62,27 @@ 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
     contacts_to_invite = params['q'].split(',')
     if !contacts_to_invite.empty? && request.post?
-      Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
-      session[:notice] = _('Your invitations are being sent.')
+
+      if user.is_admin?
+        person = Person.find(user.id)
+        session[:invited_members] = []
+
+        Invitation.invite(person, contacts_to_invite, '', profile) do |added_member|
+          session[:invited_members] << added_member.id
+        end
+
+        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.')
+      end
+
+
       if profile.person?
         redirect_to :controller => 'profile', :action => 'friends'
       else
@@ -64,8 +64,15 @@ class ProfileController &lt; PublicController
   end
   def members
+    @profiles_focus = []
+
     if is_cache_expired?(profile.members_cache_key(params))
       @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
+      if session[:invited_members]
+        @profiles_focus = session[:invited_members]
+
+        session.delete :invited_members
+      end
     end
   end
@@ -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) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{CGI::escapeHTML(links.to_json)}); return false", :class => "menu-submenu-trigger #{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,
@@ -47,6 +47,7 @@ class Invitation &lt; Task
   end
   def self.invite(person, contacts_to_invite, message, profile)
+
     contacts_to_invite.each do |contact_to_invite|
       next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
@@ -79,7 +80,23 @@ class Invitation &lt; Task
       if profile.person?
         InviteFriend.create(task_args) if user.nil? || !user.person.is_a_friend?(person)
       elsif profile.community?
-        InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? || !user.person.is_member_of?(profile)
+
+        if person.is_admin?
+          unless user.person.is_member_of?(profile)
+
+            profile.add_member(user.person)
+
+            #Call after add member callback
+            yield user
+
+          end
+        else
+
+          InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? || !user.person.is_member_of?(profile)
+
+          #Call after create invite member task callback
+          yield user,task_args
+        end
       else
         raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s
       end
@@ -4,8 +4,12 @@
 <% 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) %>
+      <%= profile_image_link(member, :portrait, 'li', @profiles_focus.include?(member.user_id) ? {:value =>_('New'), :class => 'new-profile'}:'') %>
     <% end %>
   </ul>
@@ -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 {
	@@ -62,11 +62,27 @@ class InviteController < PublicController		@@ -62,11 +62,27 @@ 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
66	contacts_to_invite = params['q'].split(',')	68	contacts_to_invite = params['q'].split(',')
67	if !contacts_to_invite.empty? && request.post?	69	if !contacts_to_invite.empty? && request.post?
68	- Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
69	- session[:notice] = _('Your invitations are being sent.')	70	+
		71	+ if user.is_admin?
		72	+ person = Person.find(user.id)
		73	+ session[:invited_members] = []
		74	+
		75	+ Invitation.invite(person, contacts_to_invite, '', profile) do \|added_member\|
		76	+ session[:invited_members] << added_member.id
		77	+ end
		78	+
		79	+ session[:notice] = _('This friends was added!')
		80	+ else
		81	+ Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
		82	+ session[:notice] = _('Your invitations are being sent.')
		83	+ end
		84	+
		85	+
70	if profile.person?	86	if profile.person?
71	redirect_to :controller => 'profile', :action => 'friends'	87	redirect_to :controller => 'profile', :action => 'friends'
72	else	88	else
	@@ -47,6 +47,7 @@ class Invitation < Task		@@ -47,6 +47,7 @@ class Invitation < Task
47	end	47	end
48		48
49	def self.invite(person, contacts_to_invite, message, profile)	49	def self.invite(person, contacts_to_invite, message, profile)
		50	+
50	contacts_to_invite.each do \|contact_to_invite\|	51	contacts_to_invite.each do \|contact_to_invite\|
51	next if contact_to_invite == _("Firstname Lastname <friend@email.com>")	52	next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
52		53
	@@ -79,7 +80,23 @@ class Invitation < Task		@@ -79,7 +80,23 @@ class Invitation < Task
79	if profile.person?	80	if profile.person?
80	InviteFriend.create(task_args) if user.nil? \|\| !user.person.is_a_friend?(person)	81	InviteFriend.create(task_args) if user.nil? \|\| !user.person.is_a_friend?(person)
81	elsif profile.community?	82	elsif profile.community?
82	- InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? \|\| !user.person.is_member_of?(profile)	83	+
		84	+ if person.is_admin?
		85	+ unless user.person.is_member_of?(profile)
		86	+
		87	+ profile.add_member(user.person)
		88	+
		89	+ #Call after add member callback
		90	+ yield user
		91	+
		92	+ end
		93	+ else
		94	+
		95	+ InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? \|\| !user.person.is_member_of?(profile)
		96	+
		97	+ #Call after create invite member task callback
		98	+ yield user,task_args
		99	+ end
83	else	100	else
84	raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s	101	raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s
85	end	102	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 {