Merge branch 'invitation' into stoa

Conflicts: db/schema.rb

Merge branch 'invitation' into stoa
Conflicts: db/schema.rb
Rodrigo Souto
2 parents 71439c6c ab9416d5
Showing 21 changed files with 242 additions and 85 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/models/environment.rb
app/models/organization.rb
app/models/person.rb
app/models/profile.rb
app/views/friends/index.html.erb
app/views/invite/invite_friends.html.erb
app/views/invite/select_friends.html.erb
app/views/profile/friends.html.erb
app/views/profile/members.html.erb
app/views/profile_editor/_moderation.html.erb
app/views/profile_members/_index_buttons.html.erb
db/migrate/20150121173654_add_invitation_moderation_to_profile.rb
db/migrate/20150122164937_add_invite_friends_only_to_profile.rb
db/schema.rb
features/invitation.feature
features/step_definitions/invitation_steps.rb
public/javascripts/invite.js
test/functional/invite_controller_test.rb
test/functional/search_controller_test.rb
@@ -11,7 +11,7 @@ class InviteController &lt; PublicController
     labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { |name,info| info[:label].downcase }
     last = labels.pop
     label = labels.join(', ')
-    @search_friend_fields = "#{label} #{_('or')} #{last}"
+    @search_fields = "#{label} #{_('or')} #{last}"
  
     if request.post?
       contact_list = ContactList.create
@@ -78,17 +78,17 @@ class InviteController &lt; PublicController
     end
   end
  
-  def search_friend
-    render :text => find_by_contents(:people, environment, environment.people.not_members_of(profile), params['q'], {:page => 1}, {:joins => :user})[:results].map {|person| {:id => person.id, :name => person.name} }.to_json
+  def search
+    scope = profile.invite_friends_only ? user.friends : environment.people
+    scope = scope.not_members_of(profile) if profile.organization?
+    scope = scope.not_friends_of(profile) if profile.person?
+    results = find_by_contents(:people, environment, scope, params['q'], {:page => 1}, {:joins => :user})[:results]
+    render :text => prepare_to_token_input(results).to_json
   end
  
   protected
  
   def check_permissions_to_invite
-    if profile.person? and !user.has_permission?(:manage_friends, profile) or
-      profile.community? and !user.has_permission?(:invite_members, profile)
-      render_access_denied
-    end
+    render_access_denied if !profile.allow_invitation_from?(user)
   end
-
 end
@@ -86,7 +86,9 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def admins
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', Environment::Roles.admin(self).id])
+    admin_role = Environment::Roles.admin(self)
+    return [] if admin_role.blank?
+    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', admin_role.id])
   end
  
   # returns the available features for a Environment, in the form of a
@@ -177,4 +177,8 @@ class Organization &lt; Profile
     self.visible = false
     save!
   end
+
+  def allow_invitation_from?(person)
+    (followed_by?(person) && self.allow_members_to_invite) || person.has_permission?('invite-members', self)
+  end
 end
@@ -34,10 +34,22 @@ class Person &lt; Profile
 roles] }
   }
  
-  def has_permission_with_plugins?(permission, profile)
-    permissions = [has_permission_without_plugins?(permission, profile)]
+  scope :not_friends_of, lambda { |resources|
+    resources = Array(resources)
+    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id)] }
+  }
+
+  def has_permission_with_admin?(permission, resource)
+    return true if resource.blank? || resource.admins.include?(self)
+    return true if resource.kind_of?(Profile) && resource.environment.admins.include?(self)
+    has_permission_without_admin?(permission, resource)
+  end
+  alias_method_chain :has_permission?, :admin
+
+  def has_permission_with_plugins?(permission, resource)
+    permissions = [has_permission_without_plugins?(permission, resource)]
     permissions += plugins.map do |plugin|
-      plugin.has_permission?(self, permission, profile)
+      plugin.has_permission?(self, permission, resource)
     end
     permissions.include?(true)
   end
@@ -513,6 +525,10 @@ roles] }
     suggestion.disable if suggestion
   end
  
+  def allow_invitation_from?(person)
+    person.has_permission?(:manage_friends, self)
+  end
+
   protected
  
   def followed_by?(profile)
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
  
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only
  
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -797,7 +797,10 @@ private :generate_url, :url_options
   end
  
   def admins
-    self.members_by_role(Profile::Roles.admin(environment.id))
+    return [] if environment.blank?
+    admin_role = Profile::Roles.admin(environment.id)
+    return [] if admin_role.blank?
+    self.members_by_role(admin_role)
   end
  
   def enable_contact?
@@ -1001,4 +1004,8 @@ private :generate_url, :url_options
     suggestion.disable if suggestion
   end
  
+  def allow_invitation_from(person)
+    false
+  end
+
 end
@@ -16,7 +16,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 => 'invite_friends') %>
+      <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
     <% end %>
   <% end %>
  
 <% if profile.person? %>
-  <h1><%= _('Invite your friends') %></h1>
+  <h1><%= _('Ask for friendship') %></h1>
+  <% description = _('You can search for user profiles and ask them to become your friends.') %>
 <% else %>
-  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
+  <h1><%= _('Invite people to join') %></h1>
+  <% description = _('You can search for user profiles and invite them to join this group.') %>
 <% end %>
  
-<% if profile.community? %>
-  <h2><%= _('Invite registered users') %></h2>
-  <p><%= _('You can search for user profiles and invite them to join this community.') %></p>
+<h3>
+  <%= _("Choose person by:") %>
+</h3>
+
+<p>
+  <%= labelled_radio_button _("Name"), :invite_friend_by, 1, true, :id => "invite_friend_by_name", :class => "invite_friend_by" %>
+  <%= labelled_radio_button _("Email"), :invite_friend_by, 2, false, :id => "invite_friend_by_email", :class => "invite_friend_by" %>
+</p>
+
+<div class='invite_by_name'>
+  <p><%= description %></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_fields}') % {:search_fields => @search_friend_fields},
-                                :focus => false }) %>
+    <% search_action = url_for(:action => 'search') %>
+    <%= token_input_field_tag(
+      :q, 'search-people', search_action,
+      { :hint_text => _('Type in the person\'s %{search_fields}') % {:search_fields => @search_fields},
+        :focus => false }) %>
  
     <% button_bar do %>
       <%= submit_button('save', _('Invite'))%>
       <%= button('cancel', _('Cancel'), profile.url)%>
     <% end %>
   <% end %>
+</div>
  
-  <br />
+<div class='invite_by_email' style="display: none;">
   <h2><%= _('Invite people from my e-mail contacts') %></h2>
   <% header = 'h3' %>
  
-<% end %>
-
 <%= render :partial => 'invite/select_address_book', :locals => {:header => header} %>
+</div>
  
 <div id="loadingScreen"></div>
+<%= javascript_include_tag 'invite' %>
 <%= render :partial => 'invite/dialog_wait_loading', :locals => {:contact_list => @contact_list.id } if @import_from != 'manual' %>
  
 <% if profile.person? %>
-  <h1><%= _('Invite your friends') %></h1>
+  <h1><%= _('Invite people') %></h1>
 <% else %>
-  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
+  <h1><%= _('Invite people to join') %></h1>
 <% end %>
  
  
-<h2><%= _('Step 2 of 2: Selecting Friends') %></h2>
+<h2><%= _('Step 2 of 2: Selecting People') %></h2>
  
 <%= button(:back, _('Back'), { :action => 'invite_friends' }, :id => 'invitation_back_button') %>
  
 <p>
-<%= _('Indicate which friends you want to invite.') %>
+<%= _('Indicate which people you want to invite.') %>
 </p>
  
 <%= form_tag do %>
@@ -33,6 +33,6 @@
   <%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
  
   <% button_bar do %>
-    <%= submit_button(:ok, _("Invite my friends!")) %>
+    <%= submit_button(:ok, _("Invite!")) %>
   <% end %>
 <% end %>
@@ -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 => 'invite_friends') %>
+    <%= button(:person, _('Invite people'), :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 => 'invite_friends' %>
+      <%= button :person, _('Invite people to join'), :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' %>
 <h2><%= _('Moderation options') %></h2>
 <% if profile.community? %>
   <div style='margin-bottom: 1em'>
+    <h4><%= _('Invitation moderation:')%></h4>
+  </div>
+  <div style='margin-bottom: 0.5em'>
+    <%= check_box(:profile_data, :allow_members_to_invite, :style => 'float: left') %>
+    <div style='margin-left: 30px'>
+      <%= _('Allow all members to send invitation (Default: only administrator)') %>
+    </div>
+    <br>
+    <div class = 'invite_friends_only' >
+      <%= check_box(:profile_data, :invite_friends_only, :style => 'float: left') %>
+      <div style='margin-left: 30px'>
+        <%= _('Allow members to invite only friends (Default: all users)') %>
+      </div>
+    </div>
+  </div>
+  <br>
+
+  <div style='margin-bottom: 1em'>
     <%= _('New members must be approved:')%>
   </div>
   <div style='margin-bottom: 0.5em'>
@@ -33,3 +51,5 @@
     <%= _('<strong>After</strong> being published in this group (a moderator can always remove publicated articles later).') %>
   </div>
 </div>
+
+<%= javascript_include_tag('invite') %>
@@ -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 => 'invite_friends' %>
+    <%= button :person, _('Invite people to join'), :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' %>
@@ -0,0 +1,9 @@
+class AddInvitationModerationToProfile < ActiveRecord::Migration
+  def up
+    add_column :profiles, :allow_members_to_invite, :boolean, :default => true
+  end
+
+  def down
+    remove_column :profiles, :allow_members_to_invite
+  end
+end
@@ -0,0 +1,9 @@
+class AddInviteFriendsOnlyToProfile < ActiveRecord::Migration
+  def up
+    add_column :profiles, :invite_friends_only, :boolean, :default => false
+  end
+
+  def down
+    remove_column :profiles, :invite_friends_only
+  end
+end
@@ -519,6 +519,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
     t.string   "personal_website"
     t.string   "jabber_id"
     t.integer  "welcome_page_id"
+    t.boolean  "allow_members_to_invite",               :default => true
+    t.boolean  "invite_friends_only",                   :default => false
   end
  
   add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
@@ -17,53 +17,50 @@ Feature: invitation
  
   Scenario: see link to invite friends
     When I am on /profile/josesilva/friends
-    Then I should see "Invite people from my e-mail contacts" link
+    Then I should see "Invite people" link
  
   Scenario: see link to invite friends in myprofile
     When I am on /myprofile/josesilva/friends
-    Then I should see "Invite people from my e-mail contacts" link
+    Then I should see "Invite people" link
  
   Scenario: go to invitation screen when follow link to invite friends
     Given I am on /myprofile/josesilva/friends
-    When I follow "Invite people from my e-mail contacts"
+    When I follow "Invite people"
     Then I am on /profile/josesilva/invite/friends
  
-  Scenario: see title when invite friends
-    When I am on /profile/josesilva/invite/friends
-    Then I should see "Invite your friends"
-
   @selenium
   Scenario: back to friends after invite friends
     Given I am on /myprofile/josesilva/friends
-    And I follow "Invite people from my e-mail contacts"
+    And I follow "Invite people"
+    And I choose "Email"
     And I press "Next"
     And I fill in "manual_import_addresses" with "misfits@devil.doll"
     And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
-    When I press "Invite my friends!"
+    When I press "Invite!"
     Then I should be on /profile/josesilva/friends
  
   Scenario: see link to invite members to community
     When I am on /profile/26-bsslines/members
-    Then I should see "Invite your friends to join 26 Bsslines" link
+    Then I should see "Invite people to join" link
  
   Scenario: not see link to invite members to community if has no rights
     Given I am logged in as "josesantos"
     When I am on /profile/26-bsslines/members
-    Then I should not see "Invite your friends to join 26 Bsslines" link
+    Then I should not see "Invite people to join" link
  
   Scenario: go to invitation screen when follow link to invite members
     Given I am on /profile/26-bsslines/members
-    When I follow "Invite your friends to join 26 Bsslines"
+    When I follow "Invite people to join"
     Then I am on /profile/26-bsslines/invite/friends
  
   Scenario: see title when invite members
     When I am on /profile/26-bsslines/invite/friends
-    Then I should see "Invite your friends to join 26 Bsslines"
+    Then I should see "Invite people to join"
  
   Scenario: not see link to invite members to enterprise
     When I am on /profile/beatles-for-sale/members
-    Then I should not see "Invite your friends to join Beatles For Sale" link
+    Then I should not see "Invite people to join" link
  
   Scenario: deny access if user has no right to invite members
     Given I am logged in as "josesantos"
@@ -72,28 +69,30 @@ Feature: invitation
  
   Scenario: not see link to invite members to enterprise in manage members
     Given I am on Beatles For Sale's members management
-    Then I should not see "Invite your friends to join Beatles For Sale" link
+    Then I should not see "Invite people to join" link
  
   @selenium
   Scenario: back to members after invite friends to join a community
     Given I am on 26 Bsslines's members management
-    And I follow "Invite your friends to join 26 Bsslines"
+    And I follow "Invite people"
+    And I choose "Email"
     And I press "Next"
     And I fill in "manual_import_addresses" with "misfits@devil.doll"
     And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
-    When I press "Invite my friends!"
+    When I press "Invite!"
     Then I should be on /profile/26-bsslines/members
  
   @selenium
   Scenario: noosfero user receives a task when a user invites to join a community
     Given I am on 26 Bsslines's members management
-    And I follow "Invite your friends to join 26 Bsslines"
+    And I follow "Invite people"
+    And I choose "Email"
     And I press "Next"
     And I fill in "manual_import_addresses" with "santos@invalid.br"
     And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
-    And I press "Invite my friends!"
+    And I press "Invite!"
     Given there are no pending jobs
     When I am logged in as "josesantos"
     And I go to josesantos's control panel
@@ -133,12 +132,13 @@ Feature: invitation
   Scenario: noosfero user receives a task when a user invites to be friend
     Given I am on josesilva's control panel
     And I follow "Manage friends"
-    And I follow "Invite people from my e-mail contacts"
+    And I follow "Invite people"
+    And I choose "Email"
     And I press "Next"
     And I fill in "manual_import_addresses" with "santos@invalid.br"
     And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
-    And I press "Invite my friends!"
+    And I press "Invite!"
     Given there are no pending jobs
     When I am logged in as "josesantos"
     And I go to josesantos's control panel
 Given /^I invite email "(.+)" to join community "(.+)"$/ do |email, community|
   identifier = Community.find_by_name(community).identifier
   visit("/myprofile/#{identifier}/profile_members")
-  first(:link, "Invite your friends to join #{community}").click
+  first(:link, "Invite people to join").click
+  choose("Email")
   click_button('Next')
   fill_in('manual_import_addresses', :with => "#{email}")
   click_link('Personalize invitation mail')
   fill_in('mail_template', :with => 'Follow this link <url>')
-  click_button("Invite my friends!")
+  click_button("Invite!")
 end
  
 Given /^I invite email "(.+)" to be my friend$/ do |email|
   click_link('Manage friends')
-  click_link('Invite people from my e-mail contacts')
+  click_link('Invite people')
+  choose("Email")
   click_button('Next')
   fill_in('manual_import_addresses', :with => "#{email}")
   click_link('Personalize invitation mail')
   fill_in('mail_template', :with => 'Follow this link <url>')
-  click_button("Invite my friends!")
+  click_button("Invite!")
 end
@@ -0,0 +1,52 @@
+(function($){
+  'use strict';
+
+  function toggle_invitation_method() {
+    if (+(this.value) === 1) {
+      $('.invite_by_email').hide();
+      $('.invite_by_name').show();
+    } else {
+      $('.invite_by_name').hide();
+      $('.invite_by_email').show();
+    }
+  }
+
+  function manage_members_moderation() {
+    var checked = $('#profile_data_allow_members_to_invite').is(':checked');
+
+    if (checked) {
+      $('.invite_friends_only').show();
+    } else {
+      $('.invite_friends_only').hide();
+    }
+  }
+
+  function hide_invite_friend_login_password() {
+    $('#invite-friends-login-password').hide();
+  }
+
+  function show_invite_friend_login_password() {
+    if (this.value === 'hotmail') {
+      $('#hotmail_username_tip').show();
+    } else {
+      $('#hotmail_username_tip').hide();
+    }
+
+    $('#invite-friends-login-password').show();
+    $('#login').focus();
+  }
+
+  $(document).ready(function() {
+    $('.invite_by_email').hide();
+    manage_members_moderation();
+
+    // Event triggers
+    $('.invite_friend_by').click(toggle_invitation_method);
+
+    $("#import_from_manual").click(hide_invite_friend_login_password);
+
+    $('.invite_by_this_email').click(show_invite_friend_login_password);
+
+    $('#profile_data_allow_members_to_invite').click(manage_members_moderation);
+  });
+})(jQuery);
@@ -101,7 +101,6 @@ class InviteControllerTest &lt; ActionController::TestCase
   should 'display invitation page' do
     get :invite_friends, :profile => profile.identifier
     assert_response :success
-    assert_tag :tag => 'h1', :content => 'Invite your friends'
   end
  
   should 'get mail template to invite members' do
@@ -243,18 +242,18 @@ class InviteControllerTest &lt; ActionController::TestCase
     friend1.save
     friend2.save
  
-    get :search_friend, :profile => profile.identifier, :q => 'me@'
+    get :search, :profile => profile.identifier, :q => 'me@'
  
     assert_equal 'text/html', @response.content_type
     assert_equal [{"id" => friend2.id, "name" => friend2.name}].to_json, @response.body
  
-    get :search_friend, :profile => profile.identifier, :q => 'cri'
+    get :search, :profile => profile.identifier, :q => 'cri'
  
     assert_equal [{"id" => friend1.id, "name" => friend1.name}].to_json, @response.body
  
-    get :search_friend, :profile => profile.identifier, :q => 'will'
+    get :search, :profile => profile.identifier, :q => 'will'
  
-    assert_equal [{"id" => friend1.id, "name" => friend1.name}, {"id" => friend2.id, "name" => friend2.name}].to_json, @response.body
+    assert_equivalent [{"id" => friend1.id, "name" => friend1.name}, {"id" => friend2.id, "name" => friend2.name}], json_response
   end
  
   should 'not include members in search friends profiles' do
@@ -266,11 +265,25 @@ class InviteControllerTest &lt; ActionController::TestCase
  
     community.add_member(friend2)
  
-    get :search_friend, :profile => community.identifier, :q => 'will'
+    get :search, :profile => community.identifier, :q => 'will'
  
     assert_equivalent [{"name" => friend1.name, "id" => friend1.id}], json_response
   end
  
+  should 'not include friends in search for people to request friendship' do
+    friend1 = create_user('willy').person
+    friend2 = create_user('william').person
+
+    profile.add_friend friend1
+    friend1.add_friend profile
+    profile.add_friend friend2
+    friend2.add_friend profile
+
+    get :search, :profile => profile.identifier, :q => 'will'
+
+    assert_empty json_response
+  end
+
   should 'invite registered users through profile id' do
     friend1 = create_user('testuser1').person
     friend2 = create_user('testuser2').person
@@ -471,25 +471,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
   end
  
-  should 'not add script tag for google maps if searching articles' do
-    ent = create_profile_with_optional_category(Enterprise, 'teste')
-    get 'articles', :query => 'article', :display => 'map'
-
-    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
-  end
-
-  should 'not add script tag for google maps if searching people' do
-    get 'people', :query => 'person', :display => 'map'
-
-    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
-  end
-
-  should 'not add script tag for google maps if searching communities' do
-    get 'communities', :query => 'community', :display => 'map'
-
-    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
-  end
-
   should 'show events of specific day' do
     person = create_user('anotheruser').person
     event = create_event(person, :name => 'Joao Birthday', :start_date => Date.new(2009, 10, 28))
@@ -1139,6 +1139,17 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equal (Person.all - Person.members_of(community)).sort, Person.not_members_of(community).sort
   end
  
+  should 'return unique non-friends of a person' do
+    friend = fast_create(Person)
+    not_friend = fast_create(Person)
+    person = fast_create(Person)
+    person.add_friend(friend)
+    friend.add_friend(person)
+
+    assert_includes Person.not_friends_of(person), not_friend
+    assert_not_includes Person.not_friends_of(person), friend
+  end
+
   should 'be able to pass array to members_of' do
     person1 = fast_create(Person)
     community = fast_create(Community)
@@ -1263,6 +1274,23 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equivalent [person_scrap,person_activity], person.activities.map { |a| a.klass.constantize.find(a.id) }
   end
  
+  should 'grant every permission over profile for its admin' do
+    admin = create_user('some-user').person
+    profile = fast_create(Profile)
+    profile.add_admin(admin)
+
+    assert admin.has_permission?('anything', profile), 'Admin does not have every permission!'
+  end
+
+  should 'grant every permission over profile for environment admin' do
+    admin = create_user('some-user').person
+    profile = fast_create(Profile)
+    environment = profile.environment
+    environment.add_admin(admin)
+
+    assert admin.has_permission?('anything', profile), 'Environment admin does not have every permission!'
+  end
+
   should 'allow plugins to extend person\'s permission access' do
     person = create_user('some-user').person
     class Plugin1 < Noosfero::Plugin
...	...	@@ -11,7 +11,7 @@ class InviteController < PublicController
11	11	labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { \|name,info\| info[:label].downcase }
12	12	last = labels.pop
13	13	label = labels.join(', ')
14		- @search_friend_fields = "#{label} #{_('or')} #{last}"
	14	+ @search_fields = "#{label} #{_('or')} #{last}"
15	15
16	16	if request.post?
17	17	contact_list = ContactList.create
...	...	@@ -78,17 +78,17 @@ class InviteController < PublicController
78	78	end
79	79	end
80	80
81		- def search_friend
82		- render :text => find_by_contents(:people, environment, environment.people.not_members_of(profile), params['q'], {:page => 1}, {:joins => :user})[:results].map {\|person\| {:id => person.id, :name => person.name} }.to_json
	81	+ def search
	82	+ scope = profile.invite_friends_only ? user.friends : environment.people
	83	+ scope = scope.not_members_of(profile) if profile.organization?
	84	+ scope = scope.not_friends_of(profile) if profile.person?
	85	+ results = find_by_contents(:people, environment, scope, params['q'], {:page => 1}, {:joins => :user})[:results]
	86	+ render :text => prepare_to_token_input(results).to_json
83	87	end
84	88
85	89	protected
86	90
87	91	def check_permissions_to_invite
88		- if profile.person? and !user.has_permission?(:manage_friends, profile) or
89		- profile.community? and !user.has_permission?(:invite_members, profile)
90		- render_access_denied
91		- end
	92	+ render_access_denied if !profile.allow_invitation_from?(user)
92	93	end
93		-
94	94	end
...	...
...	...	@@ -86,7 +86,9 @@ class Environment < ActiveRecord::Base
86	86	end
87	87
88	88	def admins
89		- Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', Environment::Roles.admin(self).id])
	89	+ admin_role = Environment::Roles.admin(self)
	90	+ return [] if admin_role.blank?
	91	+ Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', admin_role.id])
90	92	end
91	93
92	94	# returns the available features for a Environment, in the form of a
...	...
...	...	@@ -177,4 +177,8 @@ class Organization < Profile
177	177	self.visible = false
178	178	save!
179	179	end
	180	+
	181	+ def allow_invitation_from?(person)
	182	+ (followed_by?(person) && self.allow_members_to_invite) \|\| person.has_permission?('invite-members', self)
	183	+ end
180	184	end
...	...
...	...	@@ -34,10 +34,22 @@ class Person < Profile
34	34	roles] }
35	35	}
36	36
37		- def has_permission_with_plugins?(permission, profile)
38		- permissions = [has_permission_without_plugins?(permission, profile)]
	37	+ scope :not_friends_of, lambda { \|resources\|
	38	+ resources = Array(resources)
	39	+ { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id)] }
	40	+ }
	41	+
	42	+ def has_permission_with_admin?(permission, resource)
	43	+ return true if resource.blank? \|\| resource.admins.include?(self)
	44	+ return true if resource.kind_of?(Profile) && resource.environment.admins.include?(self)
	45	+ has_permission_without_admin?(permission, resource)
	46	+ end
	47	+ alias_method_chain :has_permission?, :admin
	48	+
	49	+ def has_permission_with_plugins?(permission, resource)
	50	+ permissions = [has_permission_without_plugins?(permission, resource)]
39	51	permissions += plugins.map do \|plugin\|
40		- plugin.has_permission?(self, permission, profile)
	52	+ plugin.has_permission?(self, permission, resource)
41	53	end
42	54	permissions.include?(true)
43	55	end
...	...	@@ -513,6 +525,10 @@ roles] }
513	525	suggestion.disable if suggestion
514	526	end
515	527
	528	+ def allow_invitation_from?(person)
	529	+ person.has_permission?(:manage_friends, self)
	530	+ end
	531	+
516	532	protected
517	533
518	534	def followed_by?(profile)
...	...
...	...	@@ -3,7 +3,7 @@
3	3	# which by default is the one returned by Environment:default.
4	4	class Profile < ActiveRecord::Base
5	5
6		- attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions
	6	+ attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only
7	7
8	8	# use for internationalizable human type names in search facets
9	9	# reimplement on subclasses
...	...	@@ -797,7 +797,10 @@ private :generate_url, :url_options
797	797	end
798	798
799	799	def admins
800		- self.members_by_role(Profile::Roles.admin(environment.id))
	800	+ return [] if environment.blank?
	801	+ admin_role = Profile::Roles.admin(environment.id)
	802	+ return [] if admin_role.blank?
	803	+ self.members_by_role(admin_role)
801	804	end
802	805
803	806	def enable_contact?
...	...	@@ -1001,4 +1004,8 @@ private :generate_url, :url_options
1001	1004	suggestion.disable if suggestion
1002	1005	end
1003	1006
	1007	+ def allow_invitation_from(person)
	1008	+ false
	1009	+ end
	1010	+
1004	1011	end
...	...
...	...	@@ -16,7 +16,7 @@
16	16	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
17	17	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
18	18	<% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
19		- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
	19	+ <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
20	20	<% end %>
21	21	<% end %>
22	22
...	...
1	1	<% if profile.person? %>
2		- <h1><%= _('Invite your friends') %></h1>
	2	+ <h1><%= _('Ask for friendship') %></h1>
	3	+ <% description = _('You can search for user profiles and ask them to become your friends.') %>
3	4	<% else %>
4		- <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
	5	+ <h1><%= _('Invite people to join') %></h1>
	6	+ <% description = _('You can search for user profiles and invite them to join this group.') %>
5	7	<% end %>
6	8
7		-<% if profile.community? %>
8		- <h2><%= _('Invite registered users') %></h2>
9		- <p><%= _('You can search for user profiles and invite them to join this community.') %></p>
	9	+<h3>
	10	+ <%= _("Choose person by:") %>
	11	+</h3>
	12	+
	13	+<p>
	14	+ <%= labelled_radio_button _("Name"), :invite_friend_by, 1, true, :id => "invite_friend_by_name", :class => "invite_friend_by" %>
	15	+ <%= labelled_radio_button _("Email"), :invite_friend_by, 2, false, :id => "invite_friend_by_email", :class => "invite_friend_by" %>
	16	+</p>
	17	+
	18	+<div class='invite_by_name'>
	19	+ <p><%= description %></p>
10	20	<%= form_tag :action => 'invite_registered_friend' do %>
11		- <% search_action = url_for(:action => 'search_friend') %>
12		- <%= token_input_field_tag(:q, 'search-friends', search_action,
13		- { :hint_text => _('Type in your friend\'s %{search_fields}') % {:search_fields => @search_friend_fields},
14		- :focus => false }) %>
	21	+ <% search_action = url_for(:action => 'search') %>
	22	+ <%= token_input_field_tag(
	23	+ :q, 'search-people', search_action,
	24	+ { :hint_text => _('Type in the person\'s %{search_fields}') % {:search_fields => @search_fields},
	25	+ :focus => false }) %>
15	26
16	27	<% button_bar do %>
17	28	<%= submit_button('save', _('Invite'))%>
18	29	<%= button('cancel', _('Cancel'), profile.url)%>
19	30	<% end %>
20	31	<% end %>
	32	+</div>
21	33
22		- <br />
	34	+<div class='invite_by_email' style="display: none;">
23	35	<h2><%= _('Invite people from my e-mail contacts') %></h2>
24	36	<% header = 'h3' %>
25	37
26		-<% end %>
27		-
28	38	<%= render :partial => 'invite/select_address_book', :locals => {:header => header} %>
	39	+</div>
29	40
30	41	<div id="loadingScreen"></div>
	42	+<%= javascript_include_tag 'invite' %>
...	...
1	1	<%= render :partial => 'invite/dialog_wait_loading', :locals => {:contact_list => @contact_list.id } if @import_from != 'manual' %>
2	2
3	3	<% if profile.person? %>
4		- <h1><%= _('Invite your friends') %></h1>
	4	+ <h1><%= _('Invite people') %></h1>
5	5	<% else %>
6		- <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
	6	+ <h1><%= _('Invite people to join') %></h1>
7	7	<% end %>
8	8
9	9
10		-<h2><%= _('Step 2 of 2: Selecting Friends') %></h2>
	10	+<h2><%= _('Step 2 of 2: Selecting People') %></h2>
11	11
12	12	<%= button(:back, _('Back'), { :action => 'invite_friends' }, :id => 'invitation_back_button') %>
13	13
14	14	<p>
15		-<%= _('Indicate which friends you want to invite.') %>
	15	+<%= _('Indicate which people you want to invite.') %>
16	16	</p>
17	17
18	18	<%= form_tag do %>
...	...	@@ -33,6 +33,6 @@
33	33	<%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
34	34
35	35	<% button_bar do %>
36		- <%= submit_button(:ok, _("Invite my friends!")) %>
	36	+ <%= submit_button(:ok, _("Invite!")) %>
37	37	<% end %>
38	38	<% end %>
...	...
...	...	@@ -18,7 +18,7 @@
18	18	<%= button :back, _('Go back'), { :controller => 'profile' } %>
19	19	<% if user == profile %>
20	20	<%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
21		- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
	21	+ <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
22	22	<% end %>
23	23	<% end %>
24	24
...	...
...	...	@@ -18,7 +18,7 @@
18	18	<%= button :back, _('Go back'), { :controller => 'profile' } %>
19	19	<% if profile.community? and user %>
20	20	<% if user.has_permission?(:invite_members, profile) %>
21		- <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'invite_friends' %>
	21	+ <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
22	22	<% end %>
23	23	<% if user.has_permission?(:send_mail_to_members, profile) %>
24	24	<%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
...	...