Merge branch 'invite-user-to-community' of https://gitlab.com/larissa/noosfero into invite-user

Conflicts: app/views/friends/index.rhtml app/views/invite/_select_address_book.rhtml app/views/invite/select_friends.rhtml app/views/profile/friends.rhtml config/routes.rb plugins/stoa/lib/ext/person.rb test/functional/invite_controller_test.rb test/unit/invite_member_test.rb

Merge branch 'invite-user-to-community' of https://gitlab.com/larissa/noosfero into invite-user
Conflicts: app/views/friends/index.rhtml app/views/invite/_select_address_book.rhtml app/views/invite/select_friends.rhtml app/views/profile/friends.rhtml config/routes.rb plugins/stoa/lib/ext/person.rb test/functional/invite_controller_test.rb test/unit/invite_member_test.rb
Rodrigo Souto
2 parents 7b118e80 024d804a
Showing 37 changed files with 424 additions and 125 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/public/invite_controller.rb
app/models/article.rb
app/models/category.rb
app/models/certifier.rb
app/models/comment.rb
app/models/invitation.rb
app/models/invite_friend.rb
app/models/invite_member.rb
app/models/license.rb
app/models/national_region.rb
app/models/person.rb
app/models/product.rb
app/models/profile.rb
app/models/qualifier.rb
app/models/scrap.rb
app/models/user.rb
app/views/friends/index.html.erb
app/views/invite/_personalize_invitation_mail.rhtml
app/views/invite/_select_address_book.html.erb
@@ -182,7 +182,7 @@ class ApplicationController &lt; ActionController::Base
   private
  
   def fallback_find_by_contents(asset, scope, query, paginate_options, options)
-    scope = scope.like_search(query) unless query.blank?
+    scope = scope.like_search(query, options) unless query.blank?
     scope = scope.send(options[:filter]) unless options[:filter].blank?
     {:results => scope.paginate(paginate_options)}
   end
@@ -4,8 +4,15 @@ class InviteController &lt; PublicController
   before_filter :login_required
   before_filter :check_permissions_to_invite
  
-  def select_address_book
+  def invite_friends
     @import_from = params[:import_from] || "manual"
+    @mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
+
+    labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { |name,info| info[:label] }
+    last = labels.pop
+    label = labels.join(', ')
+    @search_friend_fields = "#{label} #{_('or')} #{last}"
+
     if request.post?
       contact_list = ContactList.create
       Delayed::Job.enqueue GetEmailContactsJob.new(@import_from, params[:login], params[:password], contact_list.id) if @import_from != 'manual'
@@ -22,7 +29,7 @@ class InviteController &lt; PublicController
       webmail_import_addresses = params[:webmail_import_addresses]
       contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)
       if !contacts_to_invite.empty?
-        Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
+        Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
         session[:notice] = _('Your invitations are being sent.')
         if profile.person?
           redirect_to :controller => 'profile', :action => 'friends'
@@ -52,14 +59,35 @@ class InviteController &lt; PublicController
   def cancel_fetching_emails
     contact_list = ContactList.find(params[:contact_list])
     contact_list.destroy
-    redirect_to :action => 'select_address_book'
+    redirect_to :action => 'invite_friends'
+  end
+
+  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 profile.person?
+        redirect_to :controller => 'profile', :action => 'friends'
+      else
+        redirect_to :controller => 'profile', :action => 'members'
+      end
+      return
+    else
+      redirect_to :action => 'invite_friends'
+      session[:notice] = _('Please enter a valid profile.')
+    end
+  end
+
+  def search_friend
+    render :text => find_by_contents(:people, environment.people.not_members_of(profile), params['q'], {:page => 1}, {:joins => :user})[:results].map {|person| {:id => person.id, :name => person.name} }.to_json
   end
  
   protected
  
   def check_permissions_to_invite
-    if profile.person? and !current_user.person.has_permission?(:manage_friends, profile) or
-      profile.community? and !current_user.person.has_permission?(:invite_members, profile)
+    if profile.person? and !user.has_permission?(:manage_friends, profile) or
+      profile.community? and !user.has_permission?(:invite_members, profile)
       render_access_denied
     end
   end
@@ -7,11 +7,11 @@ class Article &lt; ActiveRecord::Base
   acts_as_having_image
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :abstract => 3,
-    :body => 2,
-    :slug => 1,
-    :filename => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :abstract => {:label => _('Abstract'), :weight => 3},
+    :body => {:label => _('Content'), :weight => 2},
+    :slug => {:label => _('Slug'), :weight => 1},
+    :filename => {:label => _('Filename'), :weight => 1},
   }
  
   SEARCH_FILTERS = %w[
@@ -3,10 +3,10 @@ class Category &lt; ActiveRecord::Base
   attr_accessible :name, :parent_id, :display_color, :display_in_menu, :image_builder, :environment, :parent
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :acronym => 5,
-    :abbreviation => 5,
-    :slug => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :acronym => {:label => _('Acronym'), :weight => 5},
+    :abbreviation => {:label => _('Abbreviation'), :weight => 5},
+    :slug => {:label => _('Slug'), :weight => 1},
   }
  
   validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('{fn} cannot be like that.').fix_i18n
@@ -3,9 +3,9 @@ class Certifier &lt; ActiveRecord::Base
   attr_accessible :name, :environment
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :description => 3,
-    :link => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :description => {:label => _('Description'), :weight => 3},
+    :link => {:label => _('Link'), :weight => 1},
   }
  
   belongs_to :environment
 class Comment < ActiveRecord::Base
  
   SEARCHABLE_FIELDS = {
-    :title => 10,
-    :name => 4,
-    :body => 2,
+    :title => {:label => _('Title'), :weight => 10},
+    :name => {:label => _('Name'), :weight => 4},
+    :body => {:label => _('Content'), :weight => 2},
   }
  
   attr_accessible :body, :author, :name, :email, :title, :reply_of_id, :source
@@ -51,7 +51,10 @@ class Invitation &lt; Task
       next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
  
       contact_to_invite.strip!
-      if match = contact_to_invite.match(/(.*)<(.*)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
+      find_by_profile_id = false
+      if contact_to_invite.match(/^\d*$/)
+        find_by_profile_id = true
+      elsif match = contact_to_invite.match(/(.*)<(.*)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
         friend_name = match[1].strip
         friend_email = match[2]
       elsif match = contact_to_invite.strip.match(Noosfero::Constants::EMAIL_FORMAT)
@@ -61,11 +64,15 @@ class Invitation &lt; Task
         next
       end
  
-      user = User.find_by_email(friend_email)
+      begin
+        user = find_by_profile_id ? Person.find_by_id(contact_to_invite).user : User.find_by_email(friend_email)
+      rescue
+        user = nil
+      end
  
-      task_args = if user.nil?
+      task_args = if user.nil? && !find_by_profile_id
         {:person => person, :friend_name => friend_name, :friend_email => friend_email, :message => message}
-      elsif !user.person.is_a_friend?(person)
+      elsif user.present? && !(user.person.is_a_friend?(person) && profile.person?)
         {:person => person, :target => user.person}
       end
  
 class InviteFriend < Invitation
  
   settings_items :group_for_person, :group_for_friend
+  before_create :check_for_invitation_existence
  
   def perform
     person.add_friend(friend, group_for_person)
@@ -41,4 +42,11 @@ class InviteFriend &lt; Invitation
     ].join("\n\n")
   end
  
+  private
+  def check_for_invitation_existence
+    if friend
+      friend.tasks.pending.of("InviteFriend").find(:all, :conditions => {:requestor_id => person.id, :target_id => friend.id}).blank?
+    end
+  end
+
 end
@@ -2,6 +2,7 @@ class InviteMember &lt; Invitation
  
   settings_items :community_id, :type => :integer
   validates_presence_of :community_id
+  before_create :check_for_invitation_existence
  
   def community
     Community.find(community_id)
@@ -39,6 +40,14 @@ class InviteMember &lt; Invitation
     _('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}
   end
  
+  def target_notification_message
+    if friend
+      _('%{requestor} is inviting you to join "%{community}" on %{system}.') % { :system => target.environment.name, :requestor => requestor.name, :community => community.name }
+    else
+      super
+    end
+  end
+
   def expanded_message
     super.gsub /<community>/, community.name
   end
@@ -53,4 +62,11 @@ class InviteMember &lt; Invitation
     ].join("\n\n")
   end
  
+  private
+  def check_for_invitation_existence
+    if friend
+      friend.tasks.pending.of("InviteMember").find(:all, :conditions => {:requestor_id => person.id}).select { |t| t.data[:community_id] == community_id }.blank?
+    end
+  end
+
 end
@@ -3,8 +3,8 @@ class License &lt; ActiveRecord::Base
   attr_accessible :name, :url
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :url => 5,
+    :name => {:label => _('Name'), :weight => 10},
+    :url => {:label => _('URL'), :weight => 5},
   }
  
   belongs_to :environment
 class NationalRegion < ActiveRecord::Base
  
   SEARCHABLE_FIELDS = {
-    :name => 1,
-    :national_region_code => 1,
+    :name => {:label => _('Name'), :weight => 1},
+    :national_region_code => {:label => _('Region Code'), :weight => 1},
   }
  
   def self.search_city(city_name, like = false, state = nil)
@@ -21,6 +21,12 @@ class Person &lt; Profile
     { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
   }
  
+  scope :not_members_of, lambda { |resources|
+    resources = [resources] if !resources.kind_of?(Array)
+    conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
+    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions] }
+  }
+
   def has_permission_with_plugins?(permission, profile)
     permissions = [has_permission_without_plugins?(permission, profile)]
     permissions += plugins.map do |plugin|
 class Product < ActiveRecord::Base
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :description => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :description => {:label => _('Description'), :weight => 1},
   }
  
   SEARCH_FILTERS = %w[
@@ -12,9 +12,9 @@ class Profile &lt; ActiveRecord::Base
   end
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :identifier => 5,
-    :nickname => 2,
+    :name => {:label => _('Name'), :weight => 10},
+    :identifier => {:label => _('Username'), :weight => 5},
+    :nickname => {:label => _('Nickname'), :weight => 2},
   }
  
   SEARCH_FILTERS = %w[
@@ -629,6 +629,7 @@ private :generate_url, :url_options
         self.affiliate(person, Profile::Roles.admin(environment.id)) if members.count == 0
         self.affiliate(person, Profile::Roles.member(environment.id))
       end
+      person.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == self.id }.each { |invite| invite.cancel }
     else
       raise _("%s can't have members") % self.class.name
     end
@@ -3,7 +3,7 @@ class Qualifier &lt; ActiveRecord::Base
   attr_accessible :name, :environment
  
   SEARCHABLE_FIELDS = {
-    :name => 1,
+    :name => {:label => _('Name'), :weight => 1},
   }
  
   belongs_to :environment
@@ -3,7 +3,7 @@ class Scrap &lt; ActiveRecord::Base
   attr_accessible :content, :sender_id, :receiver_id, :scrap_id
  
   SEARCHABLE_FIELDS = {
-    :content => 1,
+    :content => {:label => _('Content'), :weight => 1},
   }
   validates_presence_of :content
   validates_presence_of :sender_id, :receiver_id
@@ -11,6 +11,10 @@ class User &lt; ActiveRecord::Base
   N_('Password confirmation')
   N_('Terms accepted')
  
+  SEARCHABLE_FIELDS = {
+    :email => {:label => _('Email'), :weight => 5},
+  }
+
   def self.[](login)
     self.find_by_login(login)
   end
@@ -15,7 +15,7 @@
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
       <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
       <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
-        <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+        <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
       <% end %>
     <% end %>
   <% end %>
@@ -46,7 +46,7 @@
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
     <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
-      <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+      <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
     <% end %>
   <% end %>
 <% end %>
@@ -0,0 +1,8 @@
+<br/>
+
+<%= link_to ('Personalize invitation mail'), nil, :onclick => "jQuery('#invitation-mail_template').show(); return false;" %>
+
+<div id='invitation-mail_template' style='display:none'>
+  <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
+  <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, mail_template, :cols => 72, :rows => 8)) %>
+</div>
@@ -0,0 +1,41 @@
+<% header ||='h2' %>
+<<%= header %>><%= _('Step 1 of 2: Select address book') %></<%= header %>>
+
+<%= form_tag do %>
+
+  <%= [
+        radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
+        radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
+        radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
+        radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
+      ].join("\n<br/>\n") %>
+
+  <script type="text/javascript">
+    function hide_invite_friend_login_password() {
+      $('invite-friends-login-password').hide();
+    }
+    function show_invite_friend_login_password(option) {
+      if (option == 'hotmail') {
+        $('hotmail_username_tip').show();
+      } else {
+        $('hotmail_username_tip').hide();
+      }
+      $('invite-friends-login-password').show();
+      $('login').focus();
+    }
+  </script>
+  <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
+    <div id='hotmail_username_tip'>
+      <%= ui_icon('ui-icon-alert') %>
+      <%= _('Please type your username in the format yourname@example.com') %>
+    </div>
+
+    <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
+    <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button(:forward, _("Next")) %>
+  <% end %>
+  <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
+<% end %>
@@ -0,0 +1,30 @@
+<% if profile.person? %>
+  <h1><%= _('Invite your friends') %></h1>
+<% else %>
+  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
+<% end %>
+
+<% unless profile.person? %>
+  <h2><%= _('Invite other registered users') %></h2>
+  <p><%= _('You can search for user profiles and invite them to join this community.') %></p>
+  <% form_tag :action => 'invite_registered_friend' do %>
+    <% search_action = url_for(:action => 'search_friend') %>
+    <%= token_input_field_tag(:q, 'search-friends', search_action,
+                              { :hint_text => _('Type in your friend\'s ') + @search_friend_fields,
+                                :focus => false }) %>
+
+    <% button_bar do %>
+      <%= submit_button('save', _('Invite'))%>
+      <%= button('cancel', _('Cancel'), profile.url)%>
+    <% end %>
+  <% end %>
+
+  <br />
+  <h2><%= _('Invite people from my e-mail contacts') %></h2>
+  <% header = 'h3' %>
+
+<% end %>
+
+<%= render :partial => 'invite/select_address_book', :locals => {:header => header} %>
+
+<div id="loadingScreen"></div>
@@ -1,51 +0,0 @@
-<% if profile.person? %>
-  <h1><%= _('Invite your friends') %></h1>
-<% else %>
-  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
-<% end %>
-
-<h2><%= _('Step 1 of 2: Select address book') %></h2>
-
-<%= form_tag do %>
-
-  <%= [
-        radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
-        radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
-        radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
-        radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
-      ].join("\n<br/>\n") %>
-
-  <script type="text/javascript">
-    function hide_invite_friend_login_password() {
-      $('invite-friends-login-password').hide();
-    }
-    function show_invite_friend_login_password(option) {
-      if (option == 'hotmail') {
-        $('hotmail_username_tip').show();
-      } else {
-        $('hotmail_username_tip').hide();
-      }
-      $('invite-friends-login-password').show();
-      $('login').focus();
-    }
-  </script>
-  <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
-    <div id='hotmail_username_tip'>
-      <%= ui_icon('ui-icon-alert') %>
-      <%= _('Please type your username in the format yourname@example.com') %>
-    </div>
-
-    <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
-    <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:forward, _("Next")) %>
-  <% end %>
-  <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
-<% end %>
-
-<div id="loadingScreen"></div>
-
-
-
@@ -9,7 +9,7 @@
  
 <h2><%= _('Step 2 of 2: Selecting Friends') %></h2>
  
-<%= button(:back, _('Back'), { :action => 'select_address_book' }, :id => 'invitation_back_button') %>
+<%= button(:back, _('Back'), { :action => 'invite_friends' }, :id => 'invitation_back_button') %>
  
 <p>
 <%= _('Indicate which friends you want to invite.') %>
@@ -30,14 +30,7 @@
     </div>
   <% end -%>
  
-  <br/>
-
-  <%= link_to ('Personalize invitation mail'), nil, :onclick => "jQuery('#invitation-mail_template').show(); return false;" %>
-
-  <div id='invitation-mail_template' style='display:none'>
-    <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
-    <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, @mail_template, :cols => 72, :rows => 8)) %>
-  </div>
+  <%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
  
   <% button_bar do %>
     <%= submit_button(:ok, _("Invite my friends!")) %>
@@ -18,7 +18,7 @@
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if user == profile %>
     <%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
-    <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+    <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
   <% end %>
 <% end %>
  
@@ -18,7 +18,7 @@
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if profile.community? and user %>
     <% if user.has_permission?(:invite_members, profile) %>
-      <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+      <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'invite_friends' %>
     <% end %>
     <% if user.has_permission?(:send_mail_to_members, profile) %>
       <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
@@ -2,7 +2,7 @@
   <%= button :back, _('Back'), :controller => 'profile_editor' %>
   <%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
   <% if profile.community? and user.has_permission?(:invite_members, profile) %>
-    <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>
+    <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'invite_friends' %>
   <% end %>
   <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
     <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
@@ -67,7 +67,7 @@ Noosfero::Application.routes.draw do
   match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/, :as => :catalog
  
   # invite
-  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format}/
   match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
  
   # feeds per tag
@@ -13,14 +13,32 @@ class ActiveRecord::Base
     key.join('/')
   end
  
-  def self.like_search(query)
-    if defined?(self::SEARCHABLE_FIELDS)
-      fields = self::SEARCHABLE_FIELDS.keys.map(&:to_s) & column_names
+  def self.like_search(query, options={})
+    if defined?(self::SEARCHABLE_FIELDS) || options[:fields].present?
+      fields_per_table = {}
+      fields_per_table[table_name] = (options[:fields].present? ? options[:fields] : self::SEARCHABLE_FIELDS.keys.map(&:to_s)) & column_names
+
+      if options[:joins].present?
+        join_asset = options[:joins].to_s.classify.constantize
+        if defined?(join_asset::SEARCHABLE_FIELDS) || options[:fields].present?
+          fields_per_table[join_asset.table_name] = (options[:fields].present? ? options[:fields] : join_asset::SEARCHABLE_FIELDS.keys.map(&:to_s)) & join_asset.column_names
+        end
+      end
+
       query = query.downcase.strip
-      conditions = fields.map do |field|
-        "lower(#{table_name}.#{field}) LIKE '%#{query}%'"
+      fields_per_table.delete_if { |table,fields| fields.blank? }
+      conditions = fields_per_table.map do |table,fields|
+        fields.map do |field|
+          "lower(#{table}.#{field}) LIKE '%#{query}%'"
+        end.join(' OR ')
       end.join(' OR ')
-      where(conditions)
+
+      if options[:joins].present?
+        joins(options[:joins]).where(conditions)
+      else
+        where(conditions)
+      end
+
     else
       raise "No searchable fields defined for #{self.name}"
     end
@@ -3,6 +3,8 @@ require_dependency &#39;person&#39;
 class Person
   attr_accessible :usp_id, :invitation_code
  
+  SEARCHABLE_FIELDS[:usp_id] = {:label => _('USP Number'), :weight => 5}
+
   validates_uniqueness_of :usp_id, :allow_nil => true
   settings_items :invitation_code
   validate :usp_id_or_invitation, :if => lambda { |person| person.environment && person.environment.plugin_enabled?(StoaPlugin)}
@@ -110,7 +110,7 @@ class StoaPlugin &lt; Noosfero::Plugin
     { :title => _('Invite friends'),
       :icon => 'invite-friends',
       :url => {:controller => 'invite',
-               :action => 'select_address_book'} } if context.send(:user) && context.send(:user).usp_id.present?
+               :action => 'invite_friends'} } if context.send(:user) && context.send(:user).usp_id.present?
   end
  
   def remove_invite_friends_button
@@ -121,4 +121,8 @@ class StoaPlugin &lt; Noosfero::Plugin
     {:field => :usp_id, :name => _('USP Number'), :model => 'person'}
   end
  
+  def search_friend_fields
+    [{:field => :usp_id, :name => _('USP Number')}]
+  end
+
 end
@@ -20,7 +20,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     person_without_usp_id = User.create!(:login => 'user-without', :email => 'user-without@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:invitation_code => 12345678}).person
  
     login_as(person_without_usp_id.identifier)
-    get :select_address_book, :profile => person_without_usp_id.identifier
+    get :invite_friends, :profile => person_without_usp_id.identifier
     assert_response 403
     get :select_friends, :profile => person_without_usp_id.identifier
     assert_response 403
@@ -30,7 +30,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     person_with_usp_id = User.create!(:login => 'user-with', :email => 'user-with@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
  
     login_as(person_with_usp_id.identifier)
-    get :select_address_book, :profile => person_with_usp_id.identifier
+    get :invite_friends, :profile => person_with_usp_id.identifier
     assert_response 200
     get :select_friends, :profile => person_with_usp_id.identifier, :contact_list => ContactList.create.id
     assert_response 200
@@ -42,11 +42,23 @@ class InviteControllerTest &lt; ActionController::TestCase
     organization.add_admin(person_with_usp_id)
  
     login_as(person_with_usp_id.identifier)
-    get :select_address_book, :profile => organization.identifier
+    get :invite_friends, :profile => organization.identifier
     assert_response 200
     get :select_friends, :profile => organization.identifier, :contact_list => ContactList.create.id
     assert_response 200
   end
  
+  should 'search friends profiles by usp_id' do
+    person1 = User.create!(:login => 'john', :email => 'john@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
+    User.create!(:login => 'mary', :email => 'mary@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 11111111}).person
+    organization = fast_create(Organization)
+    organization.add_admin(person1)
+
+    login_as(person1.identifier)
+    get :search_friend, :profile => organization.identifier, :q => '1234'
+
+    assert_equal [{"name" => person1.name, "id" => person1.id}].to_json, @response.body
+    assert_response 200
+  end
 end
  
@@ -99,7 +99,7 @@ class InviteControllerTest &lt; ActionController::TestCase
   end
  
   should 'display invitation page' do
-    get :select_address_book, :profile => profile.identifier
+    get :invite_friends, :profile => profile.identifier
     assert_response :success
     assert_tag :tag => 'h1', :content => 'Invite your friends'
   end
@@ -118,8 +118,8 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_equal InviteFriend.mail_template, assigns(:mail_template)
   end
  
-  should 'deny select_address_book f user has no rights to invite members' do
-    get :select_address_book, :profile => community.identifier
+  should 'deny invite_friends if user has no rights to invite members' do
+    get :invite_friends, :profile => community.identifier
     assert_response 403 # forbidden
   end
  
@@ -128,13 +128,13 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_response 403 # forbidden
   end
  
-  should 'deny select_address_book access when trying to invite friends to another user' do
-    get :select_address_book, :profile => friend.identifier
+  should 'deny invite_friends access when trying to invite friends to another user' do
+    get :invite_friends, :profile => friend.identifier
     assert_response 403 # forbidden
   end
  
   should 'deny select_friends access when trying to invite friends to another user' do
-    get :select_address_book, :profile => friend.identifier
+    get :select_friends, :profile => friend.identifier
     assert_response 403 # forbidden
   end
  
@@ -155,7 +155,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     community.add_admin(profile)
     contact_list = ContactList.create
     assert_difference 'Delayed::Job.count', 1 do
-      post :select_address_book, :profile => community.identifier, :contact_list => contact_list.id, :import_from => 'gmail'
+      post :invite_friends, :profile => community.identifier, :contact_list => contact_list.id, :import_from => 'gmail'
     end
   end
  
@@ -223,7 +223,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_difference 'ContactList.count', -1 do
       get :cancel_fetching_emails, :profile => profile.identifier, :contact_list => contact_list.id
     end
-    assert_redirected_to :action => 'select_address_book'
+    assert_redirected_to :action => 'invite_friends'
   end
  
   should 'set locale in the background job' do
@@ -235,6 +235,55 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_equal 'pt', job.payload_object.locale
   end
  
+  should 'search friends profiles by name, email or identifier' do
+    friend1 = create_user('willy').person
+    friend2 = create_user('william').person
+    friend1.name = 'cris'
+    friend2.email = 'me@example.com'
+    friend1.save
+    friend2.save
+
+    get :search_friend, :profile => profile.identifier, :q => 'me@'
+
+    assert_equal 'text/html', @response.content_type
+    assert_equal [{"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+
+    get :search_friend, :profile => profile.identifier, :q => 'cri'
+
+    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+
+    get :search_friend, :profile => profile.identifier, :q => 'will'
+
+    assert_equal [{"name" => friend1.name, "id" => friend1.id}, {"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+  end
+
+  should 'not include members in search friends profiles' do
+    community.add_admin(profile)
+    friend1 = create_user('willy').person
+    friend2 = create_user('william').person
+    friend1.save
+    friend2.save
+
+    community.add_member(friend2)
+
+    get :search_friend, :profile => community.identifier, :q => 'will'
+
+    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+  end
+
+  should 'invite registered users through profile id' do
+    friend1 = create_user('testuser1').person
+    friend2 = create_user('testuser2').person
+    assert_difference Delayed::Job, :count, 1 do
+      post :invite_registered_friend, :profile => profile.identifier, :q => "#{friend1.id},#{friend2.id}", :mail_template => "click: <url>"
+      assert_redirected_to :controller => 'profile', :action => 'friends'
+    end
+
+    assert_difference InviteFriend, :count, 2 do
+      process_delayed_job_queue
+    end
+  end
+
   private
  
   def json_response
@@ -213,7 +213,7 @@ class RoutingTest &lt; ActionController::IntegrationTest
   end
  
   def test_invite_routing
-    assert_routing('/profile/colivre/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => 'colivre')
+    assert_routing('/profile/colivre/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => 'colivre')
   end
  
   def test_chat_routing
@@ -72,6 +72,29 @@ class InvitationTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'do nothing if the invited friend is already your friend' do
+    person = create_user('person').person
+    invited_friend = create_user('invited_friend').person
+
+    invited_friend.add_friend(person)
+
+    assert_no_difference InviteFriend, :count do
+      Invitation.invite( person, [invited_friend.user.email], "", person )
+    end
+  end
+
+  should 'and yet be able to invite friends to community' do
+    person = create_user('person').person
+    invited_friend = create_user('invited_friend').person
+
+    invited_friend.add_friend(person)
+    community = fast_create(Community)
+
+    assert_difference InviteMember, :count do
+      Invitation.invite( person, [invited_friend.user.email], "", community )
+    end
+  end
+
   should 'add url on message if user removed it' do
     person = create_user('testuser1').person
     friend = create_user('testuser2').person
@@ -97,4 +120,18 @@ class InvitationTest &lt; ActiveSupport::TestCase
   should 'have a message with url' do
     assert_equal "\n\nTo accept invitation, please follow this link: <url>", Invitation.default_message_to_accept_invitation
   end
+
+  should 'invite friends through profile id' do
+    person = create_user('testuser1').person
+    friend = create_user('testuser2').person
+    community = fast_create(Community)
+
+    assert_difference InviteMember, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', community)
+    end
+    assert_difference InviteFriend, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', person)
+    end
+  end
+
 end
@@ -140,4 +140,16 @@ class InviteFriendTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.requestor.name} wants to be your friend./, email.subject)
   end
  
+  should 'not invite friends if there is a pending invitation' do
+    person = create_user('testuser1').person
+    friend = create_user('testuser2').person
+
+    assert_difference 'InviteFriend.count' do
+      InviteFriend.create({:person => person, :target => friend})
+    end
+
+    assert_no_difference 'InviteFriend.count' do
+      InviteFriend.create({:person => person, :target => friend})
+    end
+  end
 end
@@ -22,6 +22,20 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     ok('friend is member of community') { community.members.include?(friend) }
   end
  
+  should 'cancel other invitations for same community when confirmed' do
+    friend = create_user('friend').person
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+    community = fast_create(Community)
+
+    task = InviteMember.create!(:person => p1, :friend => friend, :community_id => community.id)
+    InviteMember.create!(:person => p2, :friend => friend, :community_id => community.id)
+
+    assert_difference friend.tasks.pending, :count, -2 do
+      task.finish
+    end
+  end
+
   should 'require community (person inviting other to be a member)' do
     task = InviteMember.new
     task.valid?
@@ -78,11 +92,11 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     task = InviteMember.create!(:person => p1, :friend_email => 'test@test.com', :message => '<url>', :community_id => fast_create(Community).id)
   end
  
-  should 'not send e-mails to friend if target given (person being invited)' do
+  should 'send e-mails notification to friend if target given (person being invited)' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
  
-    TaskMailer.expects(:deliver_invitation_notification).never
+    TaskMailer.expects(:deliver_target_notification).once
  
     task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
   end
@@ -117,7 +131,7 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject)
   end
  
-  should 'destroy InviteMember task when the community is destroyed' do    
+  should 'destroy InviteMember task when the community is destroyed' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
     p3 = create_user('testuser3').person
@@ -131,5 +145,42 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     assert_raise ActiveRecord::RecordNotFound do; t2.reload; end
   end
  
-end
+  should 'have target notification message only if target given (person being invited)' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+
+    task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
+    assert_nothing_raised NotImplementedError do
+      task.target_notification_message
+    end
+
+    task = InviteMember.create!(:person => p1, :friend_email => 'test@test.com', :message => '<url>', :community_id => fast_create(Community).id)
+    assert_raise NotImplementedError do
+      task.target_notification_message
+    end
+  end
+
+  should 'deliver target notification message if target given (person being invited)' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+
+    task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+    assert_match(/#{task.requestor.name} invited you to join #{task.community.name}/, email.subject)
+  end
+
+  should 'not invite member if there is a pending invitation' do
+    person = create_user('testuser1').person
+    friend = create_user('testuser2').person
+    community = fast_create(Community)
  
+    assert_difference 'InviteMember.count' do
+      InviteMember.create({:person => person, :target => friend, :community_id => community.id})
+    end
+
+    assert_no_difference 'InviteMember.count' do
+      InviteMember.create({:person => person, :target => friend, :community_id => community.id})
+    end
+  end
+end
@@ -1118,6 +1118,15 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equal [person], Person.members_of(community)
   end
  
+  should 'return unique non-members of a community' do
+    member = fast_create(Person)
+    person = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member(member)
+
+    assert_equal (Person.all - Person.members_of(community)).sort, Person.not_members_of(community).sort
+  end
+
   should 'be able to pass array to members_of' do
     person1 = fast_create(Person)
     community = fast_create(Community)
@@ -1130,6 +1139,20 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_includes Person.members_of([community, enterprise]), person2
   end
  
+  should 'be able to pass array to not_members_of' do
+    person1 = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member(person1)
+    person2 = fast_create(Person)
+    enterprise = fast_create(Enterprise)
+    enterprise.add_member(person2)
+    person3 = fast_create(Person)
+
+    assert_not_includes Person.not_members_of([community, enterprise]), person1
+    assert_not_includes Person.not_members_of([community, enterprise]), person2
+    assert_includes Person.not_members_of([community, enterprise]), person3
+  end
+
   should 'find more active people' do
     Person.destroy_all
     p1 = fast_create(Person)
...	...	@@ -182,7 +182,7 @@ class ApplicationController < ActionController::Base
182	182	private
183	183
184	184	def fallback_find_by_contents(asset, scope, query, paginate_options, options)
185		- scope = scope.like_search(query) unless query.blank?
	185	+ scope = scope.like_search(query, options) unless query.blank?
186	186	scope = scope.send(options[:filter]) unless options[:filter].blank?
187	187	{:results => scope.paginate(paginate_options)}
188	188	end
...	...
...	...	@@ -4,8 +4,15 @@ class InviteController < PublicController
4	4	before_filter :login_required
5	5	before_filter :check_permissions_to_invite
6	6
7		- def select_address_book
	7	+ def invite_friends
8	8	@import_from = params[:import_from] \|\| "manual"
	9	+ @mail_template = params[:mail_template] \|\| environment.invitation_mail_template(profile)
	10	+
	11	+ labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { \|name,info\| info[:label] }
	12	+ last = labels.pop
	13	+ label = labels.join(', ')
	14	+ @search_friend_fields = "#{label} #{_('or')} #{last}"
	15	+
9	16	if request.post?
10	17	contact_list = ContactList.create
11	18	Delayed::Job.enqueue GetEmailContactsJob.new(@import_from, params[:login], params[:password], contact_list.id) if @import_from != 'manual'
...	...	@@ -22,7 +29,7 @@ class InviteController < PublicController
22	29	webmail_import_addresses = params[:webmail_import_addresses]
23	30	contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)
24	31	if !contacts_to_invite.empty?
25		- Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
	32	+ Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
26	33	session[:notice] = _('Your invitations are being sent.')
27	34	if profile.person?
28	35	redirect_to :controller => 'profile', :action => 'friends'
...	...	@@ -52,14 +59,35 @@ class InviteController < PublicController
52	59	def cancel_fetching_emails
53	60	contact_list = ContactList.find(params[:contact_list])
54	61	contact_list.destroy
55		- redirect_to :action => 'select_address_book'
	62	+ redirect_to :action => 'invite_friends'
	63	+ end
	64	+
	65	+ def invite_registered_friend
	66	+ contacts_to_invite = params['q'].split(',')
	67	+ 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	+ if profile.person?
	71	+ redirect_to :controller => 'profile', :action => 'friends'
	72	+ else
	73	+ redirect_to :controller => 'profile', :action => 'members'
	74	+ end
	75	+ return
	76	+ else
	77	+ redirect_to :action => 'invite_friends'
	78	+ session[:notice] = _('Please enter a valid profile.')
	79	+ end
	80	+ end
	81	+
	82	+ def search_friend
	83	+ render :text => find_by_contents(:people, environment.people.not_members_of(profile), params['q'], {:page => 1}, {:joins => :user})[:results].map {\|person\| {:id => person.id, :name => person.name} }.to_json
56	84	end
57	85
58	86	protected
59	87
60	88	def check_permissions_to_invite
61		- if profile.person? and !current_user.person.has_permission?(:manage_friends, profile) or
62		- profile.community? and !current_user.person.has_permission?(:invite_members, profile)
	89	+ if profile.person? and !user.has_permission?(:manage_friends, profile) or
	90	+ profile.community? and !user.has_permission?(:invite_members, profile)
63	91	render_access_denied
64	92	end
65	93	end
...	...
...	...	@@ -7,11 +7,11 @@ class Article < ActiveRecord::Base
7	7	acts_as_having_image
8	8
9	9	SEARCHABLE_FIELDS = {
10		- :name => 10,
11		- :abstract => 3,
12		- :body => 2,
13		- :slug => 1,
14		- :filename => 1,
	10	+ :name => {:label => _('Name'), :weight => 10},
	11	+ :abstract => {:label => _('Abstract'), :weight => 3},
	12	+ :body => {:label => _('Content'), :weight => 2},
	13	+ :slug => {:label => _('Slug'), :weight => 1},
	14	+ :filename => {:label => _('Filename'), :weight => 1},
15	15	}
16	16
17	17	SEARCH_FILTERS = %w[
...	...
...	...	@@ -3,10 +3,10 @@ class Category < ActiveRecord::Base
3	3	attr_accessible :name, :parent_id, :display_color, :display_in_menu, :image_builder, :environment, :parent
4	4
5	5	SEARCHABLE_FIELDS = {
6		- :name => 10,
7		- :acronym => 5,
8		- :abbreviation => 5,
9		- :slug => 1,
	6	+ :name => {:label => _('Name'), :weight => 10},
	7	+ :acronym => {:label => _('Acronym'), :weight => 5},
	8	+ :abbreviation => {:label => _('Abbreviation'), :weight => 5},
	9	+ :slug => {:label => _('Slug'), :weight => 1},
10	10	}
11	11
12	12	validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('{fn} cannot be like that.').fix_i18n
...	...
...	...	@@ -3,9 +3,9 @@ class Certifier < ActiveRecord::Base
3	3	attr_accessible :name, :environment
4	4
5	5	SEARCHABLE_FIELDS = {
6		- :name => 10,
7		- :description => 3,
8		- :link => 1,
	6	+ :name => {:label => _('Name'), :weight => 10},
	7	+ :description => {:label => _('Description'), :weight => 3},
	8	+ :link => {:label => _('Link'), :weight => 1},
9	9	}
10	10
11	11	belongs_to :environment
...	...
1	1	class Comment < ActiveRecord::Base
2	2
3	3	SEARCHABLE_FIELDS = {
4		- :title => 10,
5		- :name => 4,
6		- :body => 2,
	4	+ :title => {:label => _('Title'), :weight => 10},
	5	+ :name => {:label => _('Name'), :weight => 4},
	6	+ :body => {:label => _('Content'), :weight => 2},
7	7	}
8	8
9	9	attr_accessible :body, :author, :name, :email, :title, :reply_of_id, :source
...	...
...	...	@@ -51,7 +51,10 @@ class Invitation < Task
51	51	next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
52	52
53	53	contact_to_invite.strip!
54		- if match = contact_to_invite.match(/(.)<(.)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
	54	+ find_by_profile_id = false
	55	+ if contact_to_invite.match(/^\d*$/)
	56	+ find_by_profile_id = true
	57	+ elsif match = contact_to_invite.match(/(.)<(.)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
55	58	friend_name = match[1].strip
56	59	friend_email = match[2]
57	60	elsif match = contact_to_invite.strip.match(Noosfero::Constants::EMAIL_FORMAT)
...	...	@@ -61,11 +64,15 @@ class Invitation < Task
61	64	next
62	65	end
63	66
64		- user = User.find_by_email(friend_email)
	67	+ begin
	68	+ user = find_by_profile_id ? Person.find_by_id(contact_to_invite).user : User.find_by_email(friend_email)
	69	+ rescue
	70	+ user = nil
	71	+ end
65	72
66		- task_args = if user.nil?
	73	+ task_args = if user.nil? && !find_by_profile_id
67	74	{:person => person, :friend_name => friend_name, :friend_email => friend_email, :message => message}
68		- elsif !user.person.is_a_friend?(person)
	75	+ elsif user.present? && !(user.person.is_a_friend?(person) && profile.person?)
69	76	{:person => person, :target => user.person}
70	77	end
71	78
...	...
1	1	class InviteFriend < Invitation
2	2
3	3	settings_items :group_for_person, :group_for_friend
	4	+ before_create :check_for_invitation_existence
4	5
5	6	def perform
6	7	person.add_friend(friend, group_for_person)
...	...	@@ -41,4 +42,11 @@ class InviteFriend < Invitation
41	42	].join("\n\n")
42	43	end
43	44
	45	+ private
	46	+ def check_for_invitation_existence
	47	+ if friend
	48	+ friend.tasks.pending.of("InviteFriend").find(:all, :conditions => {:requestor_id => person.id, :target_id => friend.id}).blank?
	49	+ end
	50	+ end
	51	+
44	52	end
...	...
...	...	@@ -2,6 +2,7 @@ class InviteMember < Invitation
2	2
3	3	settings_items :community_id, :type => :integer
4	4	validates_presence_of :community_id
	5	+ before_create :check_for_invitation_existence
5	6
6	7	def community
7	8	Community.find(community_id)
...	...	@@ -39,6 +40,14 @@ class InviteMember < Invitation
39	40	_('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}
40	41	end
41	42
	43	+ def target_notification_message
	44	+ if friend
	45	+ _('%{requestor} is inviting you to join "%{community}" on %{system}.') % { :system => target.environment.name, :requestor => requestor.name, :community => community.name }
	46	+ else
	47	+ super
	48	+ end
	49	+ end
	50	+
42	51	def expanded_message
43	52	super.gsub /<community>/, community.name
44	53	end
...	...	@@ -53,4 +62,11 @@ class InviteMember < Invitation
53	62	].join("\n\n")
54	63	end
55	64
	65	+ private
	66	+ def check_for_invitation_existence
	67	+ if friend
	68	+ friend.tasks.pending.of("InviteMember").find(:all, :conditions => {:requestor_id => person.id}).select { \|t\| t.data[:community_id] == community_id }.blank?
	69	+ end
	70	+ end
	71	+
56	72	end
...	...
...	...	@@ -3,8 +3,8 @@ class License < ActiveRecord::Base
3	3	attr_accessible :name, :url
4	4
5	5	SEARCHABLE_FIELDS = {
6		- :name => 10,
7		- :url => 5,
	6	+ :name => {:label => _('Name'), :weight => 10},
	7	+ :url => {:label => _('URL'), :weight => 5},
8	8	}
9	9
10	10	belongs_to :environment
...	...