ActionItem959: fixed the "join this group?" popup

it doesn't show if the user already asked to join but was not approved yet it stores the "not now" option in the session and is limited to 10 communities the "no and don't ask again" button now only show to logged on users changed the css to centralize the buttons to box changed the css to not break the buttons in half

ActionItem959: fixed the "join this group?" popup
it doesn't show if the user already asked to join but was not approved yet it stores the "not now" option in the session and is limited to 10 communities the "no and don't ask again" button now only show to logged on users changed the css to centralize the buttons to box changed the css to not break the buttons in half
Moises Machado · Antonio Terceiro
1 parent 622183ea
Showing 8 changed files with 61 additions and 7 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/models/person.rb
app/views/shared/join_community_popup.rhtml
public/stylesheets/common.css
test/functional/profile_controller_test.rb
test/unit/application_helper_test.rb
test/unit/person_test.rb
@@ -62,6 +62,13 @@ class ProfileController &lt; PublicController
     redirect_to profile.url
   end
+  def refuse_for_now
+    session[:no_asking] ||= []
+    session[:no_asking].shift if session[:no_asking].size >= 10
+    session[:no_asking] << profile.id
+    render :text => '', :layout => false
+  end
+
   protected
   def check_access_to_profile
@@ -245,6 +245,12 @@ module ApplicationHelper
     link_to_function(content_tag('span', label), js_code, html_options, &block)
   end
+  def button_to_remote(type, label, options, html_options = {})
+    html_options[:class] = "button with-text" unless html_options[:class]
+    html_options[:class] << " icon-#{type}"
+    link_to_remote(label, options, html_options)
+  end
+
   def button_to_remote_without_text(type, label, options, html_options = {})
     html_options[:class] = "" unless html_options[:class]
     html_options[:class] << " button icon-#{type}"
@@ -771,7 +777,10 @@ module ApplicationHelper
   def ask_to_join?
     return if environment.enabled?(:disable_join_community_popup)
     return unless profile && profile.kind_of?(Community)
-    return true unless logged_in?
+    unless logged_in?
+      return !session[:no_asking].include?(profile.id) if session[:no_asking]
+      return true
+    end
     user.ask_to_join?(profile)
   end
@@ -229,6 +229,7 @@ class Person &lt; Profile
   def ask_to_join?(community)
     return false if memberships.include?(community)
+    return false if AddMember.find(:first, :conditions => {:requestor_id => self.id, :target_id => community.id})
     !refused_communities.include?(community)
   end
@@ -7,8 +7,8 @@
     <% else %>
       <%= button(:ok, _('Yes'), :controller => 'profile', :action => 'join', :profile => profile.identifier) %>
     <% end %>
-    <%= 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) %>
+    <%= button_to_remote(:cancel, _('Not now'), :url => {:controller => 'profile', :action => 'refuse_for_now', :profile => profile.identifier}, :loaded => '$("join-community-popup").hide()') %>
+    <%= button(:cancel, _('No and don\'t ask again'), :controller => 'profile', :action => 'refuse_join', :profile => profile.identifier) if logged_in? %>
   <% end %>
 </div>
 <%= draggable_element('join-community-popup') %>
@@ -423,15 +423,12 @@ div.pending-tasks {
 #join-community-popup {
   z-index: 150;
   position: absolute;
-  width: 350px;
+  width: 405px;
   height: 180;
   right: 50px;
   top: 50px;
   background: white;
   border: 2px solid black;
-}
-
-#join-community-popup {
   text-align: center;
   cursor: move;
 }
@@ -439,6 +436,10 @@ div.pending-tasks {
   margin: 1em;
 }
+#join-community-popup .button-bar .button {
+  float: none;
+}
+
 #content #not-found,
 #content #access-denied {
   padding: 20px;
@@ -483,4 +483,20 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_includes p.refused_communities, community
   end
+  should 'register in session join refusal' do
+    community = Community.create!(:name => 'my test community')
+    get :refuse_for_now, :profile => community.identifier
+
+    assert_not_nil session[:no_asking]
+    assert_includes session[:no_asking], community.id
+  end
+
+  should 'record only 10 communities in session' do
+    @request.session[:no_asking] = (1..10).to_a
+    community = Community.create!(:name => 'my test community')
+    get :refuse_for_now, :profile => community.identifier
+
+    assert_equal ((2..10).to_a + [community.id]), @request.session[:no_asking]
+  end
+
 end
@@ -420,6 +420,18 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert !ask_to_join?
   end
+  should 'not ask_to_join if its recorded in the session' 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)
+    stubs(:session).returns({:no_asking => [c.id]})
+
+    assert !ask_to_join?
+  end
   protected
@@ -526,4 +526,12 @@ class PersonTest &lt; Test::Unit::TestCase
     assert !p.ask_to_join?(c)
   end
+  should 'not ask to join if already asked' do
+    p = create_user('test_user').person
+    c = Community.create!(:name => 'Test community', :identifier => 'test_community')
+    AddMember.create!(:person => p, :organization => c)
+
+    assert !p.ask_to_join?(c)
+  end
+
 end
	@@ -62,6 +62,13 @@ class ProfileController < PublicController		@@ -62,6 +62,13 @@ class ProfileController < PublicController
62	redirect_to profile.url	62	redirect_to profile.url
63	end	63	end
64		64
		65	+ def refuse_for_now
		66	+ session[:no_asking] \|\|= []
		67	+ session[:no_asking].shift if session[:no_asking].size >= 10
		68	+ session[:no_asking] << profile.id
		69	+ render :text => '', :layout => false
		70	+ end
		71	+
65	protected	72	protected
66		73
67	def check_access_to_profile	74	def check_access_to_profile
	@@ -229,6 +229,7 @@ class Person < Profile		@@ -229,6 +229,7 @@ class Person < Profile
229		229
230	def ask_to_join?(community)	230	def ask_to_join?(community)
231	return false if memberships.include?(community)	231	return false if memberships.include?(community)
		232	+ return false if AddMember.find(:first, :conditions => {:requestor_id => self.id, :target_id => community.id})
232	!refused_communities.include?(community)	233	!refused_communities.include?(community)
233	end	234	end
234		235
	@@ -483,4 +483,20 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -483,4 +483,20 @@ class ProfileControllerTest < Test::Unit::TestCase
483	assert_includes p.refused_communities, community	483	assert_includes p.refused_communities, community
484	end	484	end
485		485
		486	+ should 'register in session join refusal' do
		487	+ community = Community.create!(:name => 'my test community')
		488	+ get :refuse_for_now, :profile => community.identifier
		489	+
		490	+ assert_not_nil session[:no_asking]
		491	+ assert_includes session[:no_asking], community.id
		492	+ end
		493	+
		494	+ should 'record only 10 communities in session' do
		495	+ @request.session[:no_asking] = (1..10).to_a
		496	+ community = Community.create!(:name => 'my test community')
		497	+ get :refuse_for_now, :profile => community.identifier
		498	+
		499	+ assert_equal ((2..10).to_a + [community.id]), @request.session[:no_asking]
		500	+ end
		501	+
486	end	502	end
	@@ -420,6 +420,18 @@ class ApplicationHelperTest < Test::Unit::TestCase		@@ -420,6 +420,18 @@ class ApplicationHelperTest < Test::Unit::TestCase
420	assert !ask_to_join?	420	assert !ask_to_join?
421	end	421	end
422		422
		423	+ should 'not ask_to_join if its recorded in the session' do
		424	+ e = Environment.default
		425	+ e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
		426	+ stubs(:environment).returns(e)
		427	+
		428	+ c = Community.create(:name => 'test_comm', :identifier => 'test_comm')
		429	+ stubs(:profile).returns(c)
		430	+ stubs(:logged_in?).returns(false)
		431	+ stubs(:session).returns({:no_asking => [c.id]})
		432	+
		433	+ assert !ask_to_join?
		434	+ end
423		435
424	protected	436	protected
425		437
	@@ -526,4 +526,12 @@ class PersonTest < Test::Unit::TestCase		@@ -526,4 +526,12 @@ class PersonTest < Test::Unit::TestCase
526	assert !p.ask_to_join?(c)	526	assert !p.ask_to_join?(c)
527	end	527	end
528		528
		529	+ should 'not ask to join if already asked' do
		530	+ p = create_user('test_user').person
		531	+ c = Community.create!(:name => 'Test community', :identifier => 'test_community')
		532	+ AddMember.create!(:person => p, :organization => c)
		533	+
		534	+ assert !p.ask_to_join?(c)
		535	+ end
		536	+
529	end	537	end