ActionItem900: added join community popup

added an evironment feature to track the join commnity popup made the pupup appear in the rigth context added ask_to_join? method to person moved join to profile controller and added the popup added the popup window

ActionItem900: added join community popup
added an evironment feature to track the join commnity popup made the pupup appear in the rigth context added ask_to_join? method to person moved join to profile controller and added the popup added the popup window
Moises Machado · Antonio Terceiro
1 parent 0261c5e4
Showing 18 changed files with 256 additions and 51 deletions Show diff stats
app/controllers/my_profile/memberships_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/models/environment.rb
app/models/person.rb
app/views/blocks/profile_info_actions/community.rhtml
app/views/layouts/application.rhtml
app/views/memberships/join.rhtml
app/views/profile/join.rhtml
app/views/shared/join_community_popup.rhtml
db/migrate/060_add_refuse_join_table.rb
db/schema.rb
public/stylesheets/common.css
test/functional/memberships_controller_test.rb
test/functional/profile_controller_test.rb
test/unit/application_helper_test.rb
test/unit/folder_test.rb
test/unit/person_test.rb
@@ -6,15 +6,6 @@ class MembershipsController &lt; MyProfileController
     @memberships = profile.memberships
   end
-  def join
-    @to_join = Profile.find(params[:id])
-    if request.post? && params[:confirmation]
-      @to_join.add_member(profile)
-      flash[:notice] = _('%s administrator still needs to accept you as member.') % @to_join.name if @to_join.closed?
-      redirect_to @to_join.url
-    end
-  end
-
   def leave
     @to_leave = Profile.find(params[:id])
@@ -2,6 +2,7 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile
+  before_filter :login_required, :only => [:join, :refuse_join]
   helper TagsHelper
@@ -42,6 +43,21 @@ class ProfileController &lt; PublicController
     @articles = profile.top_level_articles
   end
+  def join
+    if request.post? && params[:confirmation]
+      profile.add_member(current_user.person)
+      flash[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
+      redirect_to profile.url
+    end
+  end
+
+  def refuse_join
+    p = current_user.person
+    p.refused_communities << profile
+    p.save
+    redirect_to profile.url
+  end
+
   protected
   def check_access_to_profile
@@ -761,4 +761,11 @@ module ApplicationHelper
     end
   end
+  def ask_to_join?
+    return if environment.enabled?(:disable_join_community_popup)
+    return unless profile && profile.kind_of?(Community)
+    return true unless logged_in?
+    user.ask_to_join?(profile)
+  end
+
 end
@@ -37,6 +37,7 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
+      'disable_join_community_popup' => _('Disable the popup that ask to join a group/community'),
     }
   end
@@ -219,4 +219,15 @@ class Person &lt; Profile
     self.friends.include?(person)
   end
+  has_and_belongs_to_many :refused_communities, :class_name => 'Community', :join_table => 'refused_join_community'
+
+  def ask_to_join?(community)
+    return false if memberships.include?(community)
+    !refused_communities.include?(community)
+  end
+
+  def refuse_join(community)
+    refused_communities << community
+  end
+
 end
@@ -7,7 +7,7 @@
       </li>
     <% else %>
       <li>
-        <%= link_to content_tag('span', _('Join')), { :profile => user.identifier, :controller => 'memberships', :action => 'join', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Join this community') %>
+        <%= link_to content_tag('span', _('Join')), { :profile => profile.identifier, :controller => 'profile', :action => 'join' }, :class => 'button with-text icon-add', :title => _('Join this community') %>
       </li>
     <% end %>
@@ -187,5 +187,9 @@
       <%= render :file => 'shared/theme_test_panel' %>
     <% end %>
+    <% if ask_to_join? %>
+      <%= render :file => 'shared/join_community_popup' %>
+    <% end %>
+
   </body>
 </html>
@@ -1,11 +0,0 @@
-<h1><%= _('Joining %s') % @to_join.name %></h1>
-
-<p>
-<%= _('Are you sure you want to join %s?') % @to_join.name %>
-</p>
-
-<% form_tag do %>
-  <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, _("Yes, I want to join.") % @to_join.name) %>
-  <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
-<% end %>
@@ -0,0 +1,11 @@
+<h1><%= _('Joining %s') % profile.name %></h1>
+
+<p>
+<%= _('Are you sure you want to join %s?') % profile.name %>
+</p>
+
+<% form_tag do %>
+  <%= hidden_field_tag(:confirmation, 1) %>
+  <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
+  <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
+<% end %>
@@ -0,0 +1,10 @@
+<div id='join-community-popup'>
+  <h3> <%= __('Do you want to join this community?') %> </h3>
+
+  <% button_bar do %>
+    <%= button(:ok, _('Yes'), :controller => 'profile', :action => 'join', :profile => profile.identifier) %>
+    <%= button_to_function(:cancel, _('Not now'), "$('join-community-popup').hide()") %>
+    <%= button(:cancel, _('No and don\'t ask again'), :controller => 'profile', :action => 'refuse_join', :profile => profile.identifier) %>
+  <% end %>
+</div>
+<%= draggable_element('join-community-popup') %>
@@ -0,0 +1,12 @@
+class AddRefuseJoinTable < ActiveRecord::Migration
+  def self.up
+    create_table :refused_join_community, :id => false do |t|
+      t.integer :person_id
+      t.integer :community_id
+    end
+  end
+
+  def self.down
+    drop_table :refused_join_community
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 59) do
+ActiveRecord::Schema.define(:version => 60) do
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -237,6 +237,11 @@ ActiveRecord::Schema.define(:version =&gt; 59) do
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
+  create_table "refused_join_community", :id => false, :force => true do |t|
+    t.integer "person_id"
+    t.integer "community_id"
+  end
+
   create_table "region_validators", :id => false, :force => true do |t|
     t.integer "region_id"
     t.integer "organization_id"
@@ -419,6 +419,26 @@ div.pending-tasks {
   margin: 1em;
 }
+/* join community popup */
+#join-community-popup {
+  z-index: 1000;
+  position: absolute;
+  width: 350px;
+  height: 180;
+  right: 50px;
+  top: 50px;
+  background: white;
+  border: 2px solid black;
+}
+
+#join-community-popup {
+  text-align: center;
+  cursor: move;
+}
+#join-community-popup .button-bar {
+  margin: 1em;
+}
+
 #content #not-found,
 #content #access-denied {
   padding: 20px;
@@ -27,32 +27,13 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
   def test_valid_xhtml
     assert_valid_xhtml
   end
-  
+
   should 'list current memberships' do
     get :index, :profile => profile.identifier
     assert_kind_of Array, assigns(:memberships)
   end
-  should 'present confirmation before joining a profile' do
-    community = Community.create!(:name => 'my test community')
-    get :join, :profile => profile.identifier, :id => community.id
-
-    assert_response :success
-    assert_template 'join'
-  end
-
-  should 'actually join profile' do
-    community = Community.create!(:name => 'my test community')
-    post :join, :profile => profile.identifier, :id => community.id, :confirmation => '1'
-
-    assert_response :redirect
-    assert_redirected_to community.url
-
-    profile = Profile.find(@profile.id)
-    assert profile.memberships.include?(community), 'profile should be actually added to the community'
-  end
-
   should 'present new community form' do
     get :new_community, :profile => profile.identifier
     assert_response :success
@@ -143,13 +124,6 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
     assert_not_includes profile.memberships, community
   end
-  should 'create task when join to closed organization' do
-    community = Community.create!(:name => 'my test community', :closed => true)
-    assert_difference AddMember, :count do
-      post :join, :profile => profile.identifier, :id => community.id, :confirmation => '1'
-    end
-  end
-
   should 'current user is added as admin after create new community' do
     post :new_community, :profile => profile.identifier, :community => { :name => 'My shiny new community', :description => 'This is a community devoted to anything interesting we find in the internet '}
     assert_equal Profile::Roles.admin, profile.find_roles(Community.find_by_identifier('my-shiny-new-community')).first.role
@@ -67,7 +67,7 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     login_as(@profile.identifier)
     community = Community.create!(:name => 'my test community')
     get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/join/#{community.id}" }
+    assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/join" }
   end
   should 'not show Join This Community button for member users' do
@@ -404,4 +404,57 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{community.identifier}/new" }
   end
+  should 'present confirmation before joining a profile' do
+    community = Community.create!(:name => 'my test community')
+    login_as @profile.identifier
+    get :join, :profile => community.identifier
+
+    assert_response :success
+    assert_template 'join'
+  end
+
+  should 'actually join profile' do
+    community = Community.create!(:name => 'my test community')
+    login_as @profile.identifier
+    post :join, :profile => community.identifier, :confirmation => '1'
+
+    assert_response :redirect
+    assert_redirected_to community.url
+
+    profile = Profile.find(@profile.id)
+    assert profile.memberships.include?(community), 'profile should be actually added to the community'
+  end
+
+  should 'create task when join to closed organization' do
+    community = Community.create!(:name => 'my test community', :closed => true)
+    login_as @profile.identifier
+    assert_difference AddMember, :count do
+      post :join, :profile => community.identifier, :confirmation => '1'
+    end
+  end
+
+  should 'require login to join community' do
+    community = Community.create!(:name => 'my test community', :closed => true)
+    get :join, :profile => community.identifier
+
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should 'require login to refuse join community' do
+    community = Community.create!(:name => 'my test community', :closed => true)
+    get :refuse_join, :profile => community.identifier
+
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should 'register join refusal' do
+    community = Community.create!(:name => 'my test community', :closed => true)
+    login_as @profile.identifier
+
+    get :refuse_join, :profile => community.identifier
+
+    p = Person.find(@profile.id)
+    assert_includes p.refused_communities, community
+  end
+
 end
@@ -332,6 +332,90 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
   end
+  should 'not ask_to_join unless profile defined' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
+    stubs(:environment).returns(e)
+
+    stubs(:profile).returns(nil)
+    assert ! ask_to_join?
+  end
+
+  should 'not ask_to_join unless profile is community' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
+    stubs(:environment).returns(e)
+
+    p = create_user('test_user').person
+    stubs(:profile).returns(p)
+    assert ! ask_to_join?
+  end
+
+  should 'ask_to_join if its not logged and in a community' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
+    stubs(:environment).returns(e)
+
+    c = Community.create(:name => 'test_comm', :identifier => 'test_comm')
+    stubs(:profile).returns(c)
+    stubs(:logged_in?).returns(false)
+    assert ask_to_join?
+  end
+
+  should 'ask_to_join if user say so' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
+    stubs(:environment).returns(e)
+
+    c = Community.create(:name => 'test_comm', :identifier => 'test_comm')
+    stubs(:profile).returns(c)
+    stubs(:logged_in?).returns(true)
+    p = create_user('test_user').person
+    p.stubs(:ask_to_join?).with(c).returns(true)
+    stubs(:user).returns(p)
+
+    assert ask_to_join?
+  end
+
+  should 'not ask_to_join if user say no' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
+    stubs(:environment).returns(e)
+    c = Community.create(:name => 'test_comm', :identifier => 'test_comm')
+    stubs(:profile).returns(c)
+    stubs(:logged_in?).returns(true)
+    p = create_user('test_user').person
+    p.stubs(:ask_to_join?).with(c).returns(false)
+    stubs(:user).returns(p)
+
+    assert !ask_to_join?
+  end
+
+  should 'not ask_to_join if environment say no even if its not logged and in a community' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(true)
+    stubs(:environment).returns(e)
+    c = Community.create(:name => 'test_comm', :identifier => 'test_comm')
+    stubs(:profile).returns(c)
+    stubs(:logged_in?).returns(false)
+    assert !ask_to_join?
+  end
+
+  should 'not ask_to_join if environment say no even if user say so' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(true)
+    stubs(:environment).returns(e)
+    c = Community.create(:name => 'test_comm', :identifier => 'test_comm')
+    stubs(:profile).returns(c)
+    stubs(:logged_in?).returns(true)
+    p = create_user('test_user').person
+    p.stubs(:ask_to_join?).with(c).returns(true)
+    stubs(:user).returns(p)
+
+    assert !ask_to_join?
+  end
+
+
   protected
   def url_for(args = {})
@@ -47,7 +47,7 @@ class FolderTest &lt; ActiveSupport::TestCase
   end
   should 'can display hits' do
-    profile = create_user('test_user').person
+    profile = create_user('testuser').person
     a = Folder.create!(:name => 'Test article', :profile => profile)
     assert_equal false, a.can_display_hits?
   end
@@ -495,4 +495,21 @@ class PersonTest &lt; Test::Unit::TestCase
     assert !p1.is_a_friend?(p2)
   end
+  should 'refuse join community' do
+    p = create_user('test_user').person
+    c = Community.create!(:name => 'Test community', :identifier => 'test_community')
+
+    assert p.ask_to_join?(c)
+    p.refuse_join(c)
+    assert !p.ask_to_join?(c)
+  end
+
+  should 'not ask to join for a member' do
+    p = create_user('test_user').person
+    c = Community.create!(:name => 'Test community', :identifier => 'test_community')
+    c.add_member(p)
+
+    assert !p.ask_to_join?(c)
+  end
+
 end
	@@ -6,15 +6,6 @@ class MembershipsController < MyProfileController		@@ -6,15 +6,6 @@ class MembershipsController < MyProfileController
6	@memberships = profile.memberships	6	@memberships = profile.memberships
7	end	7	end
8		8
9	- def join
10	- @to_join = Profile.find(params[:id])
11	- if request.post? && params[:confirmation]
12	- @to_join.add_member(profile)
13	- flash[:notice] = _('%s administrator still needs to accept you as member.') % @to_join.name if @to_join.closed?
14	- redirect_to @to_join.url
15	- end
16	- end
17	-
18	def leave	9	def leave
19	@to_leave = Profile.find(params[:id])	10	@to_leave = Profile.find(params[:id])
20		11
	@@ -2,6 +2,7 @@ class ProfileController < PublicController		@@ -2,6 +2,7 @@ class ProfileController < PublicController
2		2
3	needs_profile	3	needs_profile
4	before_filter :check_access_to_profile	4	before_filter :check_access_to_profile
		5	+ before_filter :login_required, :only => [:join, :refuse_join]
5		6
6	helper TagsHelper	7	helper TagsHelper
7		8
	@@ -42,6 +43,21 @@ class ProfileController < PublicController		@@ -42,6 +43,21 @@ class ProfileController < PublicController
42	@articles = profile.top_level_articles	43	@articles = profile.top_level_articles
43	end	44	end
44		45
		46	+ def join
		47	+ if request.post? && params[:confirmation]
		48	+ profile.add_member(current_user.person)
		49	+ flash[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
		50	+ redirect_to profile.url
		51	+ end
		52	+ end
		53	+
		54	+ def refuse_join
		55	+ p = current_user.person
		56	+ p.refused_communities << profile
		57	+ p.save
		58	+ redirect_to profile.url
		59	+ end
		60	+
45	protected	61	protected
46		62
47	def check_access_to_profile	63	def check_access_to_profile
	@@ -761,4 +761,11 @@ module ApplicationHelper		@@ -761,4 +761,11 @@ module ApplicationHelper
761	end	761	end
762	end	762	end
763		763
		764	+ def ask_to_join?
		765	+ return if environment.enabled?(:disable_join_community_popup)
		766	+ return unless profile && profile.kind_of?(Community)
		767	+ return true unless logged_in?
		768	+ user.ask_to_join?(profile)
		769	+ end
		770	+
764	end	771	end
	@@ -37,6 +37,7 @@ class Environment < ActiveRecord::Base		@@ -37,6 +37,7 @@ class Environment < ActiveRecord::Base
37	'disable_select_city_for_contact' => _('Disable state/city select for contact form'),	37	'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
38	'disable_contact_person' => _('Disable contact for people'),	38	'disable_contact_person' => _('Disable contact for people'),
39	'disable_contact_community' => _('Disable contact for groups/communities'),	39	'disable_contact_community' => _('Disable contact for groups/communities'),
		40	+ 'disable_join_community_popup' => _('Disable the popup that ask to join a group/community'),
40	}	41	}
41	end	42	end
42		43
	@@ -219,4 +219,15 @@ class Person < Profile		@@ -219,4 +219,15 @@ class Person < Profile
219	self.friends.include?(person)	219	self.friends.include?(person)
220	end	220	end
221		221
		222	+ has_and_belongs_to_many :refused_communities, :class_name => 'Community', :join_table => 'refused_join_community'
		223	+
		224	+ def ask_to_join?(community)
		225	+ return false if memberships.include?(community)
		226	+ !refused_communities.include?(community)
		227	+ end
		228	+
		229	+ def refuse_join(community)
		230	+ refused_communities << community
		231	+ end
		232	+
222	end	233	end
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	</li>	7	</li>
8	<% else %>	8	<% else %>
9	<li>	9	<li>
10	- <%= link_to content_tag('span', _('Join')), { :profile => user.identifier, :controller => 'memberships', :action => 'join', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Join this community') %>	10	+ <%= link_to content_tag('span', _('Join')), { :profile => profile.identifier, :controller => 'profile', :action => 'join' }, :class => 'button with-text icon-add', :title => _('Join this community') %>
11	</li>	11	</li>
12	<% end %>	12	<% end %>
13		13
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-<h1><%= _('Joining %s') % @to_join.name %></h1>
2	-
3	-<p>
4	-<%= _('Are you sure you want to join %s?') % @to_join.name %>
5	-</p>
6	-
7	-<% form_tag do %>
8	- <%= hidden_field_tag(:confirmation, 1) %>
9	- <%= submit_button(:ok, _("Yes, I want to join.") % @to_join.name) %>
10	- <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
11	-<% end %>
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+<h1><%= _('Joining %s') % profile.name %></h1>
	2	+
	3	+<p>
	4	+<%= _('Are you sure you want to join %s?') % profile.name %>
	5	+</p>
	6	+
	7	+<% form_tag do %>
	8	+ <%= hidden_field_tag(:confirmation, 1) %>
	9	+ <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
	10	+ <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
	11	+<% end %>
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+<div id='join-community-popup'>
	2	+ <h3> <%= __('Do you want to join this community?') %> </h3>
	3	+
	4	+ <% button_bar do %>
	5	+ <%= button(:ok, _('Yes'), :controller => 'profile', :action => 'join', :profile => profile.identifier) %>
	6	+ <%= button_to_function(:cancel, _('Not now'), "$('join-community-popup').hide()") %>
	7	+ <%= button(:cancel, _('No and don\'t ask again'), :controller => 'profile', :action => 'refuse_join', :profile => profile.identifier) %>
	8	+ <% end %>
	9	+</div>
	10	+<%= draggable_element('join-community-popup') %>
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class AddRefuseJoinTable < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :refused_join_community, :id => false do \|t\|
	4	+ t.integer :person_id
	5	+ t.integer :community_id
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ drop_table :refused_join_community
	11	+ end
	12	+end