ActionItem1021: "Page not exists" when exit from community on another environment

* move leave logic to profile_controller * use lightbox to leave confirmation, like join * store location to remember to where redirect

ActionItem1021: "Page not exists" when exit from community on another environment
* move leave logic to profile_controller * use lightbox to leave confirmation, like join * store location to remember to where redirect
Joenio Costa · Antonio Terceiro
1 parent e6c801d6
Showing 14 changed files with 189 additions and 71 deletions Show diff stats
app/controllers/my_profile/memberships_controller.rb
app/controllers/public/profile_controller.rb
app/models/profile.rb
app/views/account/_profile_details.rhtml
app/views/blocks/profile_info_actions/community.rhtml
app/views/memberships/index.rhtml
app/views/memberships/leave.rhtml
app/views/profile/leave.rhtml
app/views/shared/join_community_popup.rhtml
lib/authenticated_system.rb
test/functional/cms_controller_test.rb
test/functional/memberships_controller_test.rb
test/functional/profile_controller_test.rb
test/unit/profile_test.rb
@@ -6,19 +6,6 @@ class MembershipsController &lt; MyProfileController
     @memberships = profile.memberships
   end
  
-  def leave
-    @to_leave = Profile.find(params[:id])
-    @wizard = params[:wizard]
-    if request.post? && params[:confirmation]
-      @to_leave.remove_member(profile)
-      if @wizard
-        redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
-      else
-        redirect_to :action => 'index'
-      end
-    end
-  end
-
   def new_community
     @community = Community.new(params[:community])
     @wizard = params[:wizard].blank? ? false : params[:wizard]
@@ -2,7 +2,7 @@ class ProfileController &lt; PublicController
  
   needs_profile
   before_filter :check_access_to_profile
-  before_filter :login_required, :only => [:join, :refuse_join]
+  before_filter :login_required, :only => [:join, :refuse_join, :leave]
  
   helper TagsHelper
  
@@ -55,9 +55,27 @@ class ProfileController &lt; PublicController
       if @wizard
         redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
       else
-        redirect_to profile.url
+        redirect_back_or_default profile.url
       end
     else
+      store_location(request.referer)
+      if request.xhr?
+        render :layout => false
+      end
+    end
+  end
+
+  def leave
+    @wizard = params[:wizard]
+    if request.post? && params[:confirmation]
+      profile.remove_member(current_user.person)
+      if @wizard
+        redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
+      else
+        redirect_back_or_default profile.url
+      end
+    else
+      store_location(request.referer)
       if request.xhr?
         render :layout => false
       end
@@ -350,6 +350,14 @@ class Profile &lt; ActiveRecord::Base
     { :profile => identifier, :controller => 'profile_editor', :action => 'index' }
   end
  
+  def leave_url
+    { :profile => identifier, :controller => 'profile', :action => 'leave' }
+  end
+
+  def join_url
+    { :profile => identifier, :controller => 'profile', :action => 'join' }
+  end
+
   def public_profile_url
     generate_url(:profile => identifier, :controller => 'profile', :action => 'index')
   end
@@ -7,11 +7,11 @@
   <%= _('Members: %s') % @profile.members.size.to_s %> <br/>
   <%= _('Created at: %s') % show_date(@profile.created_at) %> <br/>
  
-<% form_tag({ :profile => @profile.identifier, :controller => 'profile', :action => 'join'}) do %>
+<% form_tag(@profile.join_url) do %>
   <%= hidden_field_tag(:confirmation, 1) %>
   <%= hidden_field_tag(:wizard, true) %>
   <% if @profile.members.include?(user) %>
-    <%= link_to( _('Leave'), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => @profile.id, :confirmation => 1, :wizard => true }, :method => 'post') %>
+    <%= link_to( _('Leave'), @profile.leave_url.merge(:confirmation => 1, :wizard => true }, :method => 'post') %>
   <% else %>
     <%= submit_button(:ok, _("Join now")) %>
   <% end %>
@@ -3,11 +3,11 @@
  
     <% if profile.members.include?(user) %>
       <li>
-        <%= link_to content_tag('span', _('Leave')), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => profile.id }, :class => 'button with-text icon-delete', :title => _('Leave this community') %>
+        <%= lightbox_link_to content_tag('span', _('Leave')), profile.leave_url, :class => 'button with-text icon-delete', :title => _('Leave this community') %>
       </li>
     <% else %>
       <li>
-        <%= lightbox_link_to content_tag('span', _('Join')), { :profile => profile.identifier, :controller => 'profile', :action => 'join' }, :class => 'button with-text icon-add', :title => _('Join this community') %>
+        <%= lightbox_link_to content_tag('span', _('Join')), profile.join_url, :class => 'button with-text icon-add', :title => _('Join this community') %>
       </li>
     <% end %>
  
@@ -21,7 +21,7 @@
       <%= _('Members: %s') % membership.members.size.to_s %> <br/>
       <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
       <%= [ link_to(_('Manage'), membership.admin_url),
-            link_to(_('Leave'), { :profile => profile.identifier, :controller => 'memberships', :action => 'leave', :id => membership }),
+            lightbox_link_to(_('Leave'), membership.leave_url),
             (membership.community? && user.has_permission?(:destroy_profile, membership) ? link_to(_('Remove'), { :action => 'destroy_community', :id => membership }) : nil)
           ].compact.join(', ')
       %>
@@ -1,11 +0,0 @@
-<h1><%= _('Leaving %s') % @to_leave.name %></h1>
-
-<p>
-<%= _('Are you sure you want to leave %s?') % @to_leave.name %>
-</p>
-
-<% form_tag do %>
-  <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, _("Yes, I want to leave.") % @to_leave.name) %>
-  <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
-<% end %>
@@ -0,0 +1,15 @@
+<h1><%= _('Leaving %s') % profile.name %></h1>
+
+<p>
+<%= _('Are you sure you want to leave %s?') % profile.name %>
+</p>
+
+<% form_tag do %>
+  <%= hidden_field_tag(:confirmation, 1) %>
+  <%= submit_button(:ok, _("Yes, I want to leave.") % profile.name) %>
+  <% if logged_in? && request.xhr? %>
+    <%= lightbox_close_button(_("No, I don't want")) %>
+  <% else %>
+    <%= button(:cancel, _("No, I don't want."), profile.url) %>
+  <% end %>
+<% end %>
@@ -3,9 +3,9 @@
  
   <% button_bar do %>
     <% if logged_in? %>
-      <%= button(:ok, _('Yes'), { :controller => 'profile', :action => 'join', :profile => profile.identifier, :confirmation => '1'}, :method => :post) %>
+      <%= button(:ok, _('Yes'), profile.join_url.merge(:confirmation => '1'), :method => :post) %>
     <% else %>
-      <%= button(:ok, _('Yes'), :controller => 'profile', :action => 'join', :profile => profile.identifier) %>
+      <%= button(:ok, _('Yes'), profile.join_url) %>
     <% end %>
     <%= button_to_remote(:cancel, _('Not now'), :url => profile.url.merge({: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? %>
@@ -79,8 +79,8 @@ module AuthenticatedSystem
     # Store the URI of the current request in the session.
     #
     # We can return to this location by calling #redirect_back_or_default.
-    def store_location
-      session[:return_to] = request.request_uri
+    def store_location(location = request.request_uri)
+      session[:return_to] = location
     end
  
     # Redirect to the URI stored by the most recent store_location call or
@@ -1121,4 +1121,5 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     get :view, :profile => profile.identifier, :id => profile.blog.id
     assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/upload_files?parent_id=#{profile.blog.id}"}
   end
+
 end
@@ -109,41 +109,7 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
     community = Community.create!(:name => 'my test community', :description => 'description test')
     community.add_member(profile)
     get :index, :profile => profile.identifier
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/memberships/leave/#{community.id}" }, :content => 'Leave'
-  end
-
-  should 'present confirmation before leaving a profile' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-    get :leave, :profile => profile.identifier, :id => community.id
-
-    assert_response :success
-    assert_template 'leave'
-  end
-
-  should 'actually leave profile' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-    assert_includes profile.memberships, community
-    post :leave, :profile => profile.identifier, :id => community.id, :confirmation => '1'
-
-    assert_response :redirect
-    assert_redirected_to :action => 'index'
-
-    profile = Profile.find(@profile.id)
-    assert_not_includes profile.memberships, community
-  end
-
-  should 'leave profile when on wizard' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-    post :leave, :profile => profile.identifier, :id => community.id, :confirmation => '1', :wizard => true
-
-    assert_response :redirect
-    assert_redirected_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
-
-    profile = Profile.find(@profile.id)
-    assert_not_includes profile.memberships, community
+    assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/leave" }, :content => 'Leave'
   end
  
   should 'current user is added as admin after create new community' do
@@ -12,6 +12,7 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
  
     @profile = create_user('testuser').person
   end
+  attr_reader :profile
  
   def test_local_files_reference
     assert_local_files_reference
@@ -224,7 +225,8 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     community = Community.create!(:name => 'my test community')
     community.add_member(@profile)
     get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/leave/#{community.id}" }
+    assert_tag :tag => 'a',
+      :attributes => { :href => "/profile/#{community.identifier}/leave" }
   end
  
   should 'not show Leave This Community button for non-registered users' do
@@ -510,4 +512,126 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_equal ((2..10).to_a + [community.id]), @request.session[:no_asking]
   end
  
+  should 'present confirmation before leaving a profile' do
+    community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+
+    login_as(profile.identifier)
+    get :leave, :profile => community.identifier
+
+    assert_template 'leave'
+    assert_tag :tag => 'input', :attributes => {:value => 'Yes, I want to leave.', :type => 'submit'}
+  end
+
+  should 'actually leave profile' do
+    community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+    assert_includes profile.memberships, community
+
+    login_as(profile.identifier)
+    post :leave, :profile => community.identifier, :confirmation => '1'
+
+    profile = Profile.find(@profile.id)
+    assert_not_includes profile.memberships, community
+  end
+
+  should 'leave profile when on wizard' do
+    community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+
+    login_as(profile.identifier)
+    post :leave, :profile => community.identifier, :confirmation => '1', :wizard => true
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
+
+    profile = Profile.find(@profile.id)
+    assert_not_includes profile.memberships, community
+  end
+
+  should "offer button to close 'leave community' lightbox" do
+    community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+
+    login_as(profile.identifier)
+    get :index, :profile => community.identifier
+
+    assert_tag :tag => 'a', :content => 'Leave', :attributes => { :href => "/profile/#{community.identifier}/leave", :class => /^lbOn/ }
+  end
+
+  should 'offer button to cancel leaving community' do
+    community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+
+    login_as(profile.identifier)
+    get :leave, :profile => community.identifier
+
+    assert_tag :tag => 'a', :content => "No, I don't want."
+  end
+
+  should 'render without layout when use lightbox to leave community' do
+    community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+
+    @request.stubs(:xhr?).returns(true)
+    login_as(profile.identifier)
+    get :leave, :profile => community.identifier
+
+    assert_no_tag :tag => 'body' # e.g. no layout
+  end
+
+  should 'require login to leave community' do
+    community = Community.create!(:name => 'my test community')
+    get :leave, :profile => community.identifier
+
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should 'redirect to stored location after leave community' do
+    community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+
+    @request.session[:return_to] = "/profile/#{community.identifier}/to_go"
+    login_as(profile.identifier)
+
+    post :leave, :profile => community.identifier, :confirmation => '1'
+
+    assert_redirected_to "/profile/#{community.identifier}/to_go"
+  end
+
+  should 'store referer location when request leave via get' do
+    community = Community.create!(:name => 'my test community')
+    login_as(profile.identifier)
+
+    assert_nil @request.session[:return_to]
+    @request.expects(:referer).returns("/profile/redirect_to")
+
+    get :leave, :profile => community.identifier
+
+    assert_equal '/profile/redirect_to', @request.session[:return_to]
+  end
+
+  should 'store referer location when request join via get' do
+    community = Community.create!(:name => 'my test community')
+    login_as(profile.identifier)
+
+    assert_nil @request.session[:return_to]
+    @request.expects(:referer).returns("/profile/redirect_to")
+
+    get :join, :profile => community.identifier
+
+    assert_equal '/profile/redirect_to', @request.session[:return_to]
+  end
+
+  should 'redirect to stored location after join community' do
+    community = Community.create!(:name => 'my test community')
+
+    @request.session[:return_to] = "/profile/#{community.identifier}/to_go"
+    login_as(profile.identifier)
+
+    post :join, :profile => community.identifier, :confirmation => '1'
+
+    assert_redirected_to "/profile/#{community.identifier}/to_go"
+  end
+
 end
@@ -1370,6 +1370,16 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal "header customized", person.custom_header
   end
  
+  should 'provide URL to leave' do
+    profile = Profile.create!(:name => "Test Profile", :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
+    assert_equal({ :profile => 'testprofile', :controller => 'profile', :action => 'leave'}, profile.leave_url)
+  end
+
+  should 'provide URL to join' do
+    profile = Profile.create!(:name => "Test Profile", :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
+    assert_equal({ :profile => 'testprofile', :controller => 'profile', :action => 'join'}, profile.join_url)
+  end
+
   private
  
   def assert_invalid_identifier(id)
...	...	@@ -6,19 +6,6 @@ class MembershipsController < MyProfileController
6	6	@memberships = profile.memberships
7	7	end
8	8
9		- def leave
10		- @to_leave = Profile.find(params[:id])
11		- @wizard = params[:wizard]
12		- if request.post? && params[:confirmation]
13		- @to_leave.remove_member(profile)
14		- if @wizard
15		- redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
16		- else
17		- redirect_to :action => 'index'
18		- end
19		- end
20		- end
21		-
22	9	def new_community
23	10	@community = Community.new(params[:community])
24	11	@wizard = params[:wizard].blank? ? false : params[:wizard]
...	...
...	...	@@ -2,7 +2,7 @@ class ProfileController < PublicController
2	2
3	3	needs_profile
4	4	before_filter :check_access_to_profile
5		- before_filter :login_required, :only => [:join, :refuse_join]
	5	+ before_filter :login_required, :only => [:join, :refuse_join, :leave]
6	6
7	7	helper TagsHelper
8	8
...	...	@@ -55,9 +55,27 @@ class ProfileController < PublicController
55	55	if @wizard
56	56	redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
57	57	else
58		- redirect_to profile.url
	58	+ redirect_back_or_default profile.url
59	59	end
60	60	else
	61	+ store_location(request.referer)
	62	+ if request.xhr?
	63	+ render :layout => false
	64	+ end
	65	+ end
	66	+ end
	67	+
	68	+ def leave
	69	+ @wizard = params[:wizard]
	70	+ if request.post? && params[:confirmation]
	71	+ profile.remove_member(current_user.person)
	72	+ if @wizard
	73	+ redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
	74	+ else
	75	+ redirect_back_or_default profile.url
	76	+ end
	77	+ else
	78	+ store_location(request.referer)
61	79	if request.xhr?
62	80	render :layout => false
63	81	end
...	...
...	...	@@ -350,6 +350,14 @@ class Profile < ActiveRecord::Base
350	350	{ :profile => identifier, :controller => 'profile_editor', :action => 'index' }
351	351	end
352	352
	353	+ def leave_url
	354	+ { :profile => identifier, :controller => 'profile', :action => 'leave' }
	355	+ end
	356	+
	357	+ def join_url
	358	+ { :profile => identifier, :controller => 'profile', :action => 'join' }
	359	+ end
	360	+
353	361	def public_profile_url
354	362	generate_url(:profile => identifier, :controller => 'profile', :action => 'index')
355	363	end
...	...
...	...	@@ -7,11 +7,11 @@
7	7	<%= _('Members: %s') % @profile.members.size.to_s %> <br/>
8	8	<%= _('Created at: %s') % show_date(@profile.created_at) %> <br/>
9	9
10		-<% form_tag({ :profile => @profile.identifier, :controller => 'profile', :action => 'join'}) do %>
	10	+<% form_tag(@profile.join_url) do %>
11	11	<%= hidden_field_tag(:confirmation, 1) %>
12	12	<%= hidden_field_tag(:wizard, true) %>
13	13	<% if @profile.members.include?(user) %>
14		- <%= link_to( _('Leave'), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => @profile.id, :confirmation => 1, :wizard => true }, :method => 'post') %>
	14	+ <%= link_to( _('Leave'), @profile.leave_url.merge(:confirmation => 1, :wizard => true }, :method => 'post') %>
15	15	<% else %>
16	16	<%= submit_button(:ok, _("Join now")) %>
17	17	<% end %>
...	...
...	...	@@ -3,11 +3,11 @@
3	3
4	4	<% if profile.members.include?(user) %>
5	5	<li>
6		- <%= link_to content_tag('span', _('Leave')), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => profile.id }, :class => 'button with-text icon-delete', :title => _('Leave this community') %>
	6	+ <%= lightbox_link_to content_tag('span', _('Leave')), profile.leave_url, :class => 'button with-text icon-delete', :title => _('Leave this community') %>
7	7	</li>
8	8	<% else %>
9	9	<li>
10		- <%= lightbox_link_to content_tag('span', _('Join')), { :profile => profile.identifier, :controller => 'profile', :action => 'join' }, :class => 'button with-text icon-add', :title => _('Join this community') %>
	10	+ <%= lightbox_link_to content_tag('span', _('Join')), profile.join_url, :class => 'button with-text icon-add', :title => _('Join this community') %>
11	11	</li>
12	12	<% end %>
13	13
...	...
...	...	@@ -21,7 +21,7 @@
21	21	<%= _('Members: %s') % membership.members.size.to_s %> <br/>
22	22	<%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
23	23	<%= [ link_to(_('Manage'), membership.admin_url),
24		- link_to(_('Leave'), { :profile => profile.identifier, :controller => 'memberships', :action => 'leave', :id => membership }),
	24	+ lightbox_link_to(_('Leave'), membership.leave_url),
25	25	(membership.community? && user.has_permission?(:destroy_profile, membership) ? link_to(_('Remove'), { :action => 'destroy_community', :id => membership }) : nil)
26	26	].compact.join(', ')
27	27	%>
...	...
...	...	@@ -1,11 +0,0 @@
1		-<h1><%= _('Leaving %s') % @to_leave.name %></h1>
2		-
3		-<p>
4		-<%= _('Are you sure you want to leave %s?') % @to_leave.name %>
5		-</p>
6		-
7		-<% form_tag do %>
8		- <%= hidden_field_tag(:confirmation, 1) %>
9		- <%= submit_button(:ok, _("Yes, I want to leave.") % @to_leave.name) %>
10		- <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
11		-<% end %>
...	...	@@ -0,0 +1,15 @@
	1	+<h1><%= _('Leaving %s') % profile.name %></h1>
	2	+
	3	+<p>
	4	+<%= _('Are you sure you want to leave %s?') % profile.name %>
	5	+</p>
	6	+
	7	+<% form_tag do %>
	8	+ <%= hidden_field_tag(:confirmation, 1) %>
	9	+ <%= submit_button(:ok, _("Yes, I want to leave.") % profile.name) %>
	10	+ <% if logged_in? && request.xhr? %>
	11	+ <%= lightbox_close_button(_("No, I don't want")) %>
	12	+ <% else %>
	13	+ <%= button(:cancel, _("No, I don't want."), profile.url) %>
	14	+ <% end %>
	15	+<% end %>
...	...
...	...	@@ -3,9 +3,9 @@
3	3
4	4	<% button_bar do %>
5	5	<% if logged_in? %>
6		- <%= button(:ok, _('Yes'), { :controller => 'profile', :action => 'join', :profile => profile.identifier, :confirmation => '1'}, :method => :post) %>
	6	+ <%= button(:ok, _('Yes'), profile.join_url.merge(:confirmation => '1'), :method => :post) %>
7	7	<% else %>
8		- <%= button(:ok, _('Yes'), :controller => 'profile', :action => 'join', :profile => profile.identifier) %>
	8	+ <%= button(:ok, _('Yes'), profile.join_url) %>
9	9	<% end %>
10	10	<%= button_to_remote(:cancel, _('Not now'), :url => profile.url.merge({:controller => 'profile', :action => 'refuse_for_now', :profile => profile.identifier}), :loaded => '$("join-community-popup").hide()') %>
11	11	<%= button(:cancel, _('No and don\'t ask again'), :controller => 'profile', :action => 'refuse_join', :profile => profile.identifier) if logged_in? %>
...	...
...	...	@@ -79,8 +79,8 @@ module AuthenticatedSystem
79	79	# Store the URI of the current request in the session.
80	80	#
81	81	# We can return to this location by calling #redirect_back_or_default.
82		- def store_location
83		- session[:return_to] = request.request_uri
	82	+ def store_location(location = request.request_uri)
	83	+ session[:return_to] = location
84	84	end
85	85
86	86	# Redirect to the URI stored by the most recent store_location call or
...	...