Merge branch 'stable'

Antonio Terceiro
2 parents f53bed06 78f01eb3
Showing 13 changed files with 134 additions and 13 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
app/models/event.rb
app/models/people_block.rb
app/models/profile.rb
app/models/profile_list_block.rb
test/functional/profile_controller_test.rb
test/functional/role_controller_test.rb
test/unit/application_helper_test.rb
test/unit/people_block_test.rb
test/unit/profile_list_block_test.rb
vendor/plugins/access_control/lib/role.rb
@@ -2,6 +2,7 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile
+  before_filter :store_before_join, :only => [:join]
   before_filter :login_required, :only => [:join, :refuse_join, :leave]
   helper TagsHelper
@@ -61,7 +62,7 @@ class ProfileController &lt; PublicController
       if @wizard
         redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
       else
-        redirect_back_or_default profile.url
+        redirect_to_before_join
       end
     else
       store_location(request.referer)
@@ -110,6 +111,20 @@ class ProfileController &lt; PublicController
     end
   end
+  def store_before_join
+    session[:before_join] = request.referer unless logged_in?
+  end
+
+  def redirect_to_before_join
+    back = session[:before_join]
+    if back
+      session[:before_join] = nil
+      redirect_to back
+    else
+      redirect_back_or_default profile.url
+    end
+  end
+
   def per_page
     Noosfero::Constants::PROFILE_PER_PAGE
   end
@@ -852,6 +852,7 @@ module ApplicationHelper
   def ask_to_join?
     return if !environment.enabled?(:join_community_popup)
+    return if params[:action] == 'join'
     return unless profile && profile.kind_of?(Community)
     if (session[:no_asking] && session[:no_asking].include?(profile.id))
       return false
@@ -26,6 +26,8 @@ class Article &lt; ActiveRecord::Base
     article.published_at = article.created_at if article.published_at.nil?
   end
+  xss_terminate :only => [ :name ]
+
   def self.human_attribute_name(attrib)
     case attrib.to_sym
     when :name
@@ -6,7 +6,7 @@ class Event &lt; Article
   settings_items :link, :type => :string
   settings_items :address, :type => :string
-  xss_terminate :only => [ :description ], :with => 'white_list'
+  xss_terminate :only => [ :description, :link, :address ], :with => 'white_list'
   validates_presence_of :title, :start_date
@@ -28,4 +28,8 @@ class PeopleBlock &lt; ProfileListBlock
     end
   end
+  def profile_count
+    owner.people.count(:conditions => {:public_profile => true})
+  end
+
 end
@@ -270,6 +270,7 @@ class Profile &lt; ActiveRecord::Base
   end
   xss_terminate :only => [ :name, :nickname, :address, :contact_phone ]
+  xss_terminate :only => [ :custom_footer, :custom_header ], :with => 'white_list'
   # returns the contact email for this profile.
   #
@@ -89,8 +89,8 @@ class ProfileListBlock &lt; Block
     title.gsub('{#}', profile_count.to_s)
   end
-  def profile_count #defined in children
-    0
+  def profile_count
+    owner.profiles.count(:conditions => {:public_profile => true})
   end
 end
@@ -634,4 +634,27 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_redirected_to "/profile/#{community.identifier}/to_go"
   end
+  should 'store location before login when request join via get not logged' do
+    community = Community.create!(:name => 'my test community')
+
+    @request.expects(:referer).returns("/profile/#{community.identifier}")
+
+    get :join, :profile => community.identifier
+
+    assert_equal "/profile/#{community.identifier}", @request.session[:before_join]
+  end
+
+  should 'redirect to location before login after join community' do
+    community = Community.create!(:name => 'my test community')
+
+    @request.session[:before_join] = "/profile/#{community.identifier}/to_go"
+    login_as(profile.identifier)
+
+    post :join, :profile => community.identifier, :confirmation => '1'
+
+    assert_redirected_to "/profile/#{community.identifier}/to_go"
+
+    assert_nil @request.session[:before_join]
+  end
+
 end
@@ -82,4 +82,12 @@ class RoleControllerTest &lt; Test::Unit::TestCase
       assert_not_nil assigns(:role)
     end
   end
+
+  should 'not crash when editing role with no permissions' do
+    role = Role.create!(:name => 'test_role', :environment => Environment.default)
+
+    assert_nothing_raised do
+      get :edit, :id => role.id
+    end
+  end
 end
@@ -350,6 +350,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'not ask_to_join unless profile defined' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(true)
     stubs(:environment).returns(e)
@@ -359,6 +361,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'not ask_to_join unless profile is community' do
+    stubs(:params).returns({})
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(true)
     stubs(:environment).returns(e)
@@ -368,7 +371,22 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert ! ask_to_join?
   end
+  should 'not ask_to_join if action join' do
+    expects(:params).returns({:action => 'join'})
+
+    e = Environment.default
+    e.stubs(:enabled?).with(: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 'ask_to_join if its not logged and in a community' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(true)
     stubs(:environment).returns(e)
@@ -380,6 +398,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'ask_to_join if user say so' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(true)
     stubs(:environment).returns(e)
@@ -395,6 +415,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'not ask_to_join if user say no' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(true)
     stubs(:environment).returns(e)
@@ -409,6 +431,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'not ask_to_join if environment say no even if its not logged and in a community' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(false)
     stubs(:environment).returns(e)
@@ -419,6 +443,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'not ask_to_join if environment say no even if user say so' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(false)
     stubs(:environment).returns(e)
@@ -433,6 +459,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'not ask_to_join if its recorded in the session' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(true)
     stubs(:environment).returns(e)
@@ -446,6 +474,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'not ask_to_join if its recorded in the session even for authenticated users' do
+    stubs(:params).returns({})
+
     e = Environment.default
     e.stubs(:enabled?).with(:join_community_popup).returns(true)
     stubs(:environment).returns(e)
@@ -24,9 +24,8 @@ class PeopleBlockTest &lt; ActiveSupport::TestCase
   end
   should 'list people' do
-    owner = mock
-    owner.expects(:id).returns(99)
-    Person.expects(:find).with(:all, :select => 'id', :conditions => { :environment_id => 99, :public_profile => true}, :limit => 6, :order => 'random()').returns([])
+    owner = Environment.create!(:name => 'test environment')
+    Person.expects(:find).with(:all, :select => 'id', :conditions => { :environment_id => owner.id, :public_profile => true}, :limit => 6, :order => 'random()').returns([])
     block = PeopleBlock.new
     block.expects(:owner).returns(owner).at_least_once
     block.content
@@ -41,4 +40,13 @@ class PeopleBlockTest &lt; ActiveSupport::TestCase
     instance_eval(&block.footer)
   end
+  should 'count number of public people' do
+    env = Environment.create!(:name => 'test environment')
+    private_p = create_user('private', {:environment => env}, {:public_profile => false})
+    public_p = create_user('public', {:environment => env}, {:public_profile => true})
+
+    env.boxes.first.blocks << block = PeopleBlock.new
+    assert_equal 1, block.profile_count
+  end
+
 end
@@ -24,7 +24,7 @@ class ProfileListBlockTest &lt; Test::Unit::TestCase
     person2 = create_user('testperson2').person
     person3 = create_user('testperson3').person
-    owner = create_user('mytestuser').person
+    owner = Environment.create!(:name => 'test env')
     block = ProfileListBlock.new
     owner.boxes.first.blocks << block
     block.save!
@@ -68,12 +68,36 @@ class ProfileListBlockTest &lt; Test::Unit::TestCase
   end
   should 'provide view_title' do
-    p = ProfileListBlock.new(:title => 'Title from block')
-    assert_equal 'Title from block',  p.view_title
+    env = Environment.create!(:name => 'test env')
+    block = ProfileListBlock.new(:title => 'Title from block')
+    env.boxes.first.blocks << block
+    block.save!
+    assert_equal 'Title from block', block.view_title
   end
   should 'provide view title with variables' do
-    p = ProfileListBlock.new(:title => '{#} members')
-    assert_equal '0 members', p.view_title 
+    env = Environment.create!(:name => 'test env')
+    block = ProfileListBlock.new(:title => '{#} members')
+    env.boxes.first.blocks << block
+    block.save!
+    assert_equal '0 members', block.view_title
+  end
+
+  should 'count number of public profiles' do
+    env = Environment.create!(:name => 'test env')
+    block = ProfileListBlock.new
+    env.boxes.first.blocks << block
+    block.save!
+
+    priv_p = create_user('private', {:environment => env}, {:public_profile => false})
+    pub_p = create_user('public', {:environment => env}, {:public_profile => true})
+
+    priv_c = Community.create!(:name => 'com 1', :public_profile => false, :environment => env)
+    pub_c = Community.create!(:name => 'com 2', :public_profile => true , :environment => env)
+
+    priv_e = Enterprise.create!(:name => 'ent 1', :identifier => 'ent1', :public_profile => false , :environment => env)
+    pub_e = Enterprise.create!(:name => 'ent 2', :identifier => 'ent2', :public_profile => true , :environment => env)
+
+    assert_equal 3, block.profile_count
   end
 end
@@ -32,7 +32,12 @@ class Role &lt; ActiveRecord::Base
   end
   def kind
-    perms.keys.detect{|k| perms[k].keys.include?(permissions[0]) }
+    env_perms = perms['Environment'].keys
+    if permissions.any?{ |perm| env_perms.include?(perm) }
+      'Environment'
+    else
+      'Profile'
+    end
   end
   def name
	@@ -852,6 +852,7 @@ module ApplicationHelper		@@ -852,6 +852,7 @@ module ApplicationHelper
852		852
853	def ask_to_join?	853	def ask_to_join?
854	return if !environment.enabled?(:join_community_popup)	854	return if !environment.enabled?(:join_community_popup)
		855	+ return if params[:action] == 'join'
855	return unless profile && profile.kind_of?(Community)	856	return unless profile && profile.kind_of?(Community)
856	if (session[:no_asking] && session[:no_asking].include?(profile.id))	857	if (session[:no_asking] && session[:no_asking].include?(profile.id))
857	return false	858	return false
	@@ -6,7 +6,7 @@ class Event < Article		@@ -6,7 +6,7 @@ class Event < Article
6	settings_items :link, :type => :string	6	settings_items :link, :type => :string
7	settings_items :address, :type => :string	7	settings_items :address, :type => :string
8		8
9	- xss_terminate :only => [ :description ], :with => 'white_list'	9	+ xss_terminate :only => [ :description, :link, :address ], :with => 'white_list'
10		10
11	validates_presence_of :title, :start_date	11	validates_presence_of :title, :start_date
12		12
	@@ -28,4 +28,8 @@ class PeopleBlock < ProfileListBlock		@@ -28,4 +28,8 @@ class PeopleBlock < ProfileListBlock
28	end	28	end
29	end	29	end
30		30
		31	+ def profile_count
		32	+ owner.people.count(:conditions => {:public_profile => true})
		33	+ end
		34	+
31	end	35	end
	@@ -270,6 +270,7 @@ class Profile < ActiveRecord::Base		@@ -270,6 +270,7 @@ class Profile < ActiveRecord::Base
270	end	270	end
271		271
272	xss_terminate :only => [ :name, :nickname, :address, :contact_phone ]	272	xss_terminate :only => [ :name, :nickname, :address, :contact_phone ]
		273	+ xss_terminate :only => [ :custom_footer, :custom_header ], :with => 'white_list'
273		274
274	# returns the contact email for this profile.	275	# returns the contact email for this profile.
275	#	276	#
	@@ -634,4 +634,27 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -634,4 +634,27 @@ class ProfileControllerTest < Test::Unit::TestCase
634	assert_redirected_to "/profile/#{community.identifier}/to_go"	634	assert_redirected_to "/profile/#{community.identifier}/to_go"
635	end	635	end
636		636
		637	+ should 'store location before login when request join via get not logged' do
		638	+ community = Community.create!(:name => 'my test community')
		639	+
		640	+ @request.expects(:referer).returns("/profile/#{community.identifier}")
		641	+
		642	+ get :join, :profile => community.identifier
		643	+
		644	+ assert_equal "/profile/#{community.identifier}", @request.session[:before_join]
		645	+ end
		646	+
		647	+ should 'redirect to location before login after join community' do
		648	+ community = Community.create!(:name => 'my test community')
		649	+
		650	+ @request.session[:before_join] = "/profile/#{community.identifier}/to_go"
		651	+ login_as(profile.identifier)
		652	+
		653	+ post :join, :profile => community.identifier, :confirmation => '1'
		654	+
		655	+ assert_redirected_to "/profile/#{community.identifier}/to_go"
		656	+
		657	+ assert_nil @request.session[:before_join]
		658	+ end
		659	+
637	end	660	end
	@@ -82,4 +82,12 @@ class RoleControllerTest < Test::Unit::TestCase		@@ -82,4 +82,12 @@ class RoleControllerTest < Test::Unit::TestCase
82	assert_not_nil assigns(:role)	82	assert_not_nil assigns(:role)
83	end	83	end
84	end	84	end
		85	+
		86	+ should 'not crash when editing role with no permissions' do
		87	+ role = Role.create!(:name => 'test_role', :environment => Environment.default)
		88	+
		89	+ assert_nothing_raised do
		90	+ get :edit, :id => role.id
		91	+ end
		92	+ end
85	end	93	end
	@@ -24,7 +24,7 @@ class ProfileListBlockTest < Test::Unit::TestCase		@@ -24,7 +24,7 @@ class ProfileListBlockTest < Test::Unit::TestCase
24	person2 = create_user('testperson2').person	24	person2 = create_user('testperson2').person
25	person3 = create_user('testperson3').person	25	person3 = create_user('testperson3').person
26		26
27	- owner = create_user('mytestuser').person	27	+ owner = Environment.create!(:name => 'test env')
28	block = ProfileListBlock.new	28	block = ProfileListBlock.new
29	owner.boxes.first.blocks << block	29	owner.boxes.first.blocks << block
30	block.save!	30	block.save!
	@@ -68,12 +68,36 @@ class ProfileListBlockTest < Test::Unit::TestCase		@@ -68,12 +68,36 @@ class ProfileListBlockTest < Test::Unit::TestCase
68	end	68	end
69		69
70	should 'provide view_title' do	70	should 'provide view_title' do
71	- p = ProfileListBlock.new(:title => 'Title from block')
72	- assert_equal 'Title from block', p.view_title	71	+ env = Environment.create!(:name => 'test env')
		72	+ block = ProfileListBlock.new(:title => 'Title from block')
		73	+ env.boxes.first.blocks << block
		74	+ block.save!
		75	+ assert_equal 'Title from block', block.view_title
73	end	76	end
74		77
75	should 'provide view title with variables' do	78	should 'provide view title with variables' do
76	- p = ProfileListBlock.new(:title => '{#} members')
77	- assert_equal '0 members', p.view_title	79	+ env = Environment.create!(:name => 'test env')
		80	+ block = ProfileListBlock.new(:title => '{#} members')
		81	+ env.boxes.first.blocks << block
		82	+ block.save!
		83	+ assert_equal '0 members', block.view_title
		84	+ end
		85	+
		86	+ should 'count number of public profiles' do
		87	+ env = Environment.create!(:name => 'test env')
		88	+ block = ProfileListBlock.new
		89	+ env.boxes.first.blocks << block
		90	+ block.save!
		91	+
		92	+ priv_p = create_user('private', {:environment => env}, {:public_profile => false})
		93	+ pub_p = create_user('public', {:environment => env}, {:public_profile => true})
		94	+
		95	+ priv_c = Community.create!(:name => 'com 1', :public_profile => false, :environment => env)
		96	+ pub_c = Community.create!(:name => 'com 2', :public_profile => true , :environment => env)
		97	+
		98	+ priv_e = Enterprise.create!(:name => 'ent 1', :identifier => 'ent1', :public_profile => false , :environment => env)
		99	+ pub_e = Enterprise.create!(:name => 'ent 2', :identifier => 'ent2', :public_profile => true , :environment => env)
		100	+
		101	+ assert_equal 3, block.profile_count
78	end	102	end
79	end	103	end