jro_apps/redmine Commit - r1384:2d11265ec5e1

Fixed: private subprojects names are revealed on the project overview (#1152)....

Jean-Philippe Lang -

r1384:2d11265ec5e1

parent child

Context file:

r1384:2d11265ec5e1

app/controllers/projects_controller.rb +1 -1

               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
-                @subprojects = @project.active_children
+                @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers

test/fixtures/members.yml +6 0

test/fixtures/projects.yml +13 -1

@@ -3,7 +3,7 projects_001:
3	created_on: 2006-07-19 19:13:59 +02:00	3	created_on: 2006-07-19 19:13:59 +02:00
4	name: eCookbook	4	name: eCookbook
5	updated_on: 2006-07-19 22:53:01 +02:00	5	updated_on: 2006-07-19 22:53:01 +02:00
6	projects_count: 2	6	projects_count: 3
7	id: 1	7	id: 1
8	description: Recipes management application	8	description: Recipes management application
9	homepage: http://ecookbook.somenet.foo/	9	homepage: http://ecookbook.somenet.foo/
@@ -43,3 +43,15 projects_004:
43	is_public: true	43	is_public: true
44	identifier: subproject2	44	identifier: subproject2
45	parent_id: 1	45	parent_id: 1
		46	projects_005:
		47	created_on: 2006-07-19 19:15:51 +02:00
		48	name: Private child of eCookbook
		49	updated_on: 2006-07-19 19:17:07 +02:00
		50	projects_count: 0
		51	id: 5
		52	description: This is a private subproject of a public project
		53	homepage: ""
		54	is_public: false
		55	identifier: private_child
		56	parent_id: 1
		57	No newline at end of file

test/functional/projects_controller_test.rb +15 0

@@ -63,6 +63,21 class ProjectsControllerTest < Test::Unit::TestCase
63	assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)	63	assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
64	end	64	end
65		65
		66	def test_private_subprojects_hidden
		67	get :show, :id => 'ecookbook'
		68	assert_response :success
		69	assert_template 'show'
		70	assert_no_tag :tag => 'a', :content => /Private child/
		71	end
		72
		73	def test_private_subprojects_visible
		74	@request.session[:user_id] = 2 # manager who is a member of the private subproject
		75	get :show, :id => 'ecookbook'
		76	assert_response :success
		77	assert_template 'show'
		78	assert_tag :tag => 'a', :content => /Private child/
		79	end
		80
66	def test_settings	81	def test_settings
67	@request.session[:user_id] = 2 # manager	82	@request.session[:user_id] = 2 # manager
68	get :settings, :id => 1	83	get :settings, :id => 1

test/unit/project_test.rb +1 -1

                 assert sub.save
                 assert_equal @ecookbook.id, sub.parent.id
                 @ecookbook.reload
-                assert_equal 3, @ecookbook.children.size
+                assert_equal 4, @ecookbook.children.size
               end
               def test_subproject_invalid

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages