jro_apps/redmine Commit - r3646:f3cc84b3437a

Show subproject versions on the Roadmap....

Eric Davis -

r3646:f3cc84b3437a

parent child

Context file:

r3646:f3cc84b3437a

Collapse all files

app/controllers/projects_controller.rb +3 -1

                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
-                @versions = @project.shared_versions.sort
+                @versions = @project.shared_versions || []
+                @versions += @project.rolled_up_versions.visible if @with_subprojects
+                @versions = @versions.uniq.sort
                 @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
                 @issues_by_version = {}

app/models/project.rb +7 0

                   end
                 end
               end
+              # Returns a scope of the Versions on subprojects
+              def rolled_up_versions
+                @rolled_up_versions ||=
+                  Version.scoped(:include => :project,
+                                 :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status = #{STATUS_ACTIVE}", lft, rgt])
+              end
               # Returns a scope of the Versions used by the project
               def shared_versions

test/functional/projects_controller_test.rb +4 -2

               end
               def test_roadmap_showing_subprojects_versions
+                @subproject_version = Version.generate!(:project => Project.find(3))
                 get :roadmap, :id => 1, :with_subprojects => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
-                # Version on subproject appears
-                assert assigns(:versions).include?(Version.find(4))
+                assert assigns(:versions).include?(Version.find(4)), "Shared version not found"
+                assert assigns(:versions).include?(@subproject_version), "Subproject version not found"
               end
               def test_project_activity
                 get :activity, :id => 1, :with_subprojects => 0

test/unit/project_test.rb +53 0

@@ -360,6 +360,59 class ProjectTest < ActiveSupport::TestCase
360		360
361	assert_equal [1,2], parent.rolled_up_trackers.collect(&:id)	361	assert_equal [1,2], parent.rolled_up_trackers.collect(&:id)
362	end	362	end
		363
		364	context "#rolled_up_versions" do
		365	setup do
		366	@project = Project.generate!
		367	@parent_version_1 = Version.generate!(:project => @project)
		368	@parent_version_2 = Version.generate!(:project => @project)
		369	end
		370
		371	should "include the versions for the current project" do
		372	assert_same_elements [@parent_version_1, @parent_version_2], @project.rolled_up_versions
		373	end
		374
		375	should "include versions for a subproject" do
		376	@subproject = Project.generate!
		377	@subproject.set_parent!(@project)
		378	@subproject_version = Version.generate!(:project => @subproject)
		379
		380	assert_same_elements [
		381	@parent_version_1,
		382	@parent_version_2,
		383	@subproject_version
		384	], @project.rolled_up_versions
		385	end
		386
		387	should "include versions for a sub-subproject" do
		388	@subproject = Project.generate!
		389	@subproject.set_parent!(@project)
		390	@sub_subproject = Project.generate!
		391	@sub_subproject.set_parent!(@subproject)
		392	@sub_subproject_version = Version.generate!(:project => @sub_subproject)
		393
		394	@project.reload
		395
		396	assert_same_elements [
		397	@parent_version_1,
		398	@parent_version_2,
		399	@sub_subproject_version
		400	], @project.rolled_up_versions
		401	end
		402
		403
		404	should "only check active projects" do
		405	@subproject = Project.generate!
		406	@subproject.set_parent!(@project)
		407	@subproject_version = Version.generate!(:project => @subproject)
		408	assert @subproject.archive
		409
		410	@project.reload
		411
		412	assert !@subproject.active?
		413	assert_same_elements [@parent_version_1, @parent_version_2], @project.rolled_up_versions
		414	end
		415	end
363		416
364	def test_shared_versions_none_sharing	417	def test_shared_versions_none_sharing
365	p = Project.find(5)	418	p = Project.find(5)

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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