invite: allow network member/friend invitation

This feature allows organizations to invite people and users to request friendship from other users from the network instead of only through email. Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>

invite: allow network member/friend invitation
This feature allows organizations to invite people and users to request friendship from other users from the network instead of only through email. Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
David Silva · Rodrigo Souto
1 parent d1f72816
Showing 8 changed files with 117 additions and 34 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/views/friends/index.html.erb
app/views/invite/invite_friends.html.erb
app/views/profile/friends.html.erb
features/invitation.feature
features/step_definitions/invitation_steps.rb
public/javascripts/invite.js
test/functional/invite_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,8 +78,12 @@ 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
@@ -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(:search, _('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>
+  <% 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' %>
@@ -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(:search, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
   <% end %>
 <% end %>
@@ -17,25 +17,22 @@ 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"
@@ -77,7 +74,8 @@ Feature: invitation
   @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"
@@ -88,7 +86,8 @@ Feature: invitation
   @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"
@@ -133,7 +132,8 @@ 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"
@@ -2,6 +2,7 @@ Given /^I invite email &quot;(.+)&quot; to join community &quot;(.+)&quot;$/ do |email, community|
   identifier = Community.find_by_name(community).identifier
   visit("/myprofile/#{identifier}/profile_members")
   first(:link, "Invite your friends to join #{community}").click
+  choose("Email")
   click_button('Next')
   fill_in('manual_import_addresses', :with => "#{email}")
   click_link('Personalize invitation mail')
@@ -11,7 +12,8 @@ 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')
@@ -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
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>	16	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
17	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>	17	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
18	<% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>	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(:search, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
20	<% end %>	20	<% end %>
21	<% end %>	21	<% end %>
22		22
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	<%= button :back, _('Go back'), { :controller => 'profile' } %>	18	<%= button :back, _('Go back'), { :controller => 'profile' } %>
19	<% if user == profile %>	19	<% if user == profile %>
20	<%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>	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(:search, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
22	<% end %>	22	<% end %>
23	<% end %>	23	<% end %>
24		24
	@@ -2,6 +2,7 @@ Given /^I invite email "(.+)" to join community "(.+)"$/ do \|email, community\|		@@ -2,6 +2,7 @@ Given /^I invite email "(.+)" to join community "(.+)"$/ do \|email, community\|
2	identifier = Community.find_by_name(community).identifier	2	identifier = Community.find_by_name(community).identifier
3	visit("/myprofile/#{identifier}/profile_members")	3	visit("/myprofile/#{identifier}/profile_members")
4	first(:link, "Invite your friends to join #{community}").click	4	first(:link, "Invite your friends to join #{community}").click
		5	+ choose("Email")
5	click_button('Next')	6	click_button('Next')
6	fill_in('manual_import_addresses', :with => "#{email}")	7	fill_in('manual_import_addresses', :with => "#{email}")
7	click_link('Personalize invitation mail')	8	click_link('Personalize invitation mail')
	@@ -11,7 +12,8 @@ end		@@ -11,7 +12,8 @@ end
11		12
12	Given /^I invite email "(.+)" to be my friend$/ do \|email\|	13	Given /^I invite email "(.+)" to be my friend$/ do \|email\|
13	click_link('Manage friends')	14	click_link('Manage friends')
14	- click_link('Invite people from my e-mail contacts')	15	+ click_link('Invite people')
		16	+ choose("Email")
15	click_button('Next')	17	click_button('Next')
16	fill_in('manual_import_addresses', :with => "#{email}")	18	fill_in('manual_import_addresses', :with => "#{email}")
17	click_link('Personalize invitation mail')	19	click_link('Personalize invitation mail')
@@ -0,0 +1,52 @@		@@ -0,0 +1,52 @@
	1	+(function($){
	2	+ 'use strict';
	3	+
	4	+ function toggle_invitation_method() {
	5	+ if (+(this.value) === 1) {
	6	+ $('.invite_by_email').hide();
	7	+ $('.invite_by_name').show();
	8	+ } else {
	9	+ $('.invite_by_name').hide();
	10	+ $('.invite_by_email').show();
	11	+ }
	12	+ }
	13	+
	14	+ function manage_members_moderation() {
	15	+ var checked = $('#profile_data_allow_members_to_invite').is(':checked');
	16	+
	17	+ if (checked) {
	18	+ $('.invite_friends_only').show();
	19	+ } else {
	20	+ $('.invite_friends_only').hide();
	21	+ }
	22	+ }
	23	+
	24	+ function hide_invite_friend_login_password() {
	25	+ $('#invite-friends-login-password').hide();
	26	+ }
	27	+
	28	+ function show_invite_friend_login_password() {
	29	+ if (this.value === 'hotmail') {
	30	+ $('#hotmail_username_tip').show();
	31	+ } else {
	32	+ $('#hotmail_username_tip').hide();
	33	+ }
	34	+
	35	+ $('#invite-friends-login-password').show();
	36	+ $('#login').focus();
	37	+ }
	38	+
	39	+ $(document).ready(function() {
	40	+ $('.invite_by_email').hide();
	41	+ manage_members_moderation();
	42	+
	43	+ // Event triggers
	44	+ $('.invite_friend_by').click(toggle_invitation_method);
	45	+
	46	+ $("#import_from_manual").click(hide_invite_friend_login_password);
	47	+
	48	+ $('.invite_by_this_email').click(show_invite_friend_login_password);
	49	+
	50	+ $('#profile_data_allow_members_to_invite').click(manage_members_moderation);
	51	+ });
	52	+})(jQuery);