jro_apps/redmine Commit - r10376:83bcc1f04351

Adds a setting to allow subtasks to belong to other projects (#5487)....

Jean-Philippe Lang -

r10376:83bcc1f04351

parent child

Context file:

r10376:83bcc1f04351

Collapse all files

app/helpers/issues_helper.rb +2 -2

                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.all
                 ancestors.each do |ancestor|
-                  s << '<div>' + content_tag('p', link_to_issue(ancestor))
+                  s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
-                         content_tag('td', link_to_issue(child, :truncate => 60), :class => 'subject') +
+                         content_tag('td', link_to_issue(child, :truncate => 60, :project => (issue.project_id != child.project_id)), :class => 'subject') +
                          content_tag('td', h(child.status)) +
                          content_tag('td', link_to_user(child.assigned_to)) +
                          content_tag('td', progress_bar(child.done_ratio, :width => '80px')),

app/helpers/settings_helper.rb +12 0

@@ -91,4 +91,16 module SettingsHelper
91	l_or_humanize(notifiable.name, :prefix => 'label_').html_safe,	91	l_or_humanize(notifiable.name, :prefix => 'label_').html_safe,
92	:class => notifiable.parent.present? ? "parent" : '').html_safe	92	:class => notifiable.parent.present? ? "parent" : '').html_safe
93	end	93	end
		94
		95	def cross_project_subtasks_options
		96	options = [
		97	[:label_disabled, ''],
		98	[:label_cross_project_system, 'system'],
		99	[:label_cross_project_tree, 'tree'],
		100	[:label_cross_project_hierarchy, 'hierarchy'],
		101	[:label_cross_project_descendants, 'descendants']
		102	]
		103
		104	options.map {\|label, value\| [l(label), value.to_s]}
		105	end
94	end	106	end

app/models/issue.rb +26 -5

                   if fixed_version && fixed_version.project != project && !project.shared_versions.include?(fixed_version)
                     self.fixed_version = nil
                   end
-                  if parent && parent.project_id != project_id
+                  # Clear the parent task if it's no longer valid
+                  unless valid_parent_project?
                     self.parent_issue_id = nil
                   end
                   @custom_field_values = nil
                 # Checks parent issue assignment
                 if @parent_issue
-                  if @parent_issue.project_id != project_id
+                  if !valid_parent_project?(@parent_issue)
-                    errors.add :parent_issue_id, :not_same_project
+                    errors.add :parent_issue_id, :invalid
                   elsif !new_record?
                     # moving an existing issue
                     if @parent_issue.root_id != root_id
                     elsif move_possible?(@parent_issue)
                       # move accepted inside tree
                     else
-                      errors.add :parent_issue_id, :not_a_valid_parent
+                      errors.add :parent_issue_id, :invalid
                     end
                   end
                 end
                 end
               end
+            	# Returns true if issue's project is a valid
+            	# parent issue project
+              def valid_parent_project?(issue=parent)
+                return true if issue.nil? || issue.project_id == project_id
+                case Setting.cross_project_subtasks
+                when 'system'
+                  true
+                when 'tree'
+                  issue.project.root == project.root
+                when 'hierarchy'
+                  issue.project.is_or_is_ancestor_of?(project) || issue.project.is_descendant_of?(project)
+                when 'descendants'
+                  issue.project.is_or_is_ancestor_of?(project)
+                else
+                  false
+                end
+              end
               # Extracted from the ReportsController.
               def self.by_tracker(project)
                 count_and_group_by(:project => project,
                   relations_to.clear
                 end
-                # Move subtasks
+                # Move subtasks that were in the same project
                 children.each do |child|
+                  next unless child.project_id == project_id_was
                   # Change project and keep project
                   child.send :project=, project, true
                   unless child.save

app/views/issues/_attributes.html.erb +1 -1

             <div class="splitcontentright">
             <% if @issue.safe_attribute? 'parent_issue_id' %>
             <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p>
-            <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project)}')" %>
+            <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path}')" %>
             <% end %>
             <% if @issue.safe_attribute? 'start_date' %>

app/views/settings/_issues.html.erb +2 0

             <div class="box tabular settings">
             <p><%= setting_check_box :cross_project_issue_relations %></p>
+            <p><%= setting_select :cross_project_subtasks, cross_project_subtasks_options %></p>
             <p><%= setting_check_box :issue_group_assignment %></p>
             <p><%= setting_check_box :default_issue_start_date_to_creation_date %></p>

config/locales/en.yml +1 0

               setting_date_format: Date format
               setting_time_format: Time format
               setting_cross_project_issue_relations: Allow cross-project issue relations
+              setting_cross_project_subtasks: Allow cross-project subtasks
               setting_issue_list_default_columns: Default columns displayed on the issue list
               setting_repositories_encodings: Attachments and repositories encodings
               setting_emails_header: Emails header

config/locales/fr.yml +1 0

               setting_date_format: Format de date
               setting_time_format: Format d'heure
               setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
+              setting_cross_project_subtasks: Autoriser les sous-tâches dans des projets différents
               setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
               setting_emails_footer: Pied-de-page des emails
               setting_protocol: Protocole

config/settings.yml +3 0

               format: symbol
             cross_project_issue_relations:
               default: 0
+            # Enables subtasks to be in other projects
+            cross_project_subtasks:
+              default: 'tree'
             issue_group_assignment:
               default: 0
             default_issue_start_date_to_creation_date:

test/fixtures/projects_trackers.yml +3 0

             projects_trackers_014:
               project_id: 1
               tracker_id: 3
+            projects_trackers_015:
+              project_id: 6
+              tracker_id: 1
   No newline at end of file

test/test_helper.rb +8 0

                 hs
               end
+              def assert_save(object)
+                saved = object.save
+                message = "#{object.class} could not be saved"
+                errors = object.errors.full_messages.map {|m| "- #{m}"}
+                message << ":\n#{errors.join("\n")}" if errors.any?
+                assert_equal true, saved, message
+              end
               def assert_error_tag(options={})
                 assert_tag({:attributes => { :id => 'errorExplanation' }}.merge(options))
               end

test/unit/issue_nested_set_test.rb +9 -1

@@ -49,7 +49,15 class IssueNestedSetTest < ActiveSupport::TestCase
49	assert_equal [parent.id, parent.id, 2, 3], [child.root_id, child.parent_id, child.lft, child.rgt]	49	assert_equal [parent.id, parent.id, 2, 3], [child.root_id, child.parent_id, child.lft, child.rgt]
50	end	50	end
51		51
52	def test_creating_a_child_in_~~different_~~project_should~~_not~~_validate	52	def test_creating_a_child_in_a_subproject_should_validate
		53	issue = create_issue!
		54	child = Issue.new(:project_id => 3, :tracker_id => 2, :author_id => 1,
		55	:subject => 'child', :parent_issue_id => issue.id)
		56	assert_save child
		57	assert_equal issue, child.reload.parent
		58	end
		59
		60	def test_creating_a_child_in_an_invalid_project_should_not_validate
53	issue = create_issue!	61	issue = create_issue!
54	child = Issue.new(:project_id => 2, :tracker_id => 1, :author_id => 1,	62	child = Issue.new(:project_id => 2, :tracker_id => 1, :author_id => 1,
55	:subject => 'child', :parent_issue_id => issue.id)	63	:subject => 'child', :parent_issue_id => issue.id)

test/unit/issue_test.rb +60 0

@@ -906,6 +906,24 class IssueTest < ActiveSupport::TestCase
906	assert_equal 7, issue.fixed_version_id	906	assert_equal 7, issue.fixed_version_id
907	end	907	end
908		908
		909	def test_move_to_another_project_should_keep_parent_if_valid
		910	issue = Issue.find(1)
		911	issue.update_attribute(:parent_issue_id, 2)
		912	issue.project = Project.find(3)
		913	assert issue.save
		914	issue.reload
		915	assert_equal 2, issue.parent_id
		916	end
		917
		918	def test_move_to_another_project_should_clear_parent_if_not_valid
		919	issue = Issue.find(1)
		920	issue.update_attribute(:parent_issue_id, 2)
		921	issue.project = Project.find(2)
		922	assert issue.save
		923	issue.reload
		924	assert_nil issue.parent_id
		925	end
		926
909	def test_move_to_another_project_with_disabled_tracker	927	def test_move_to_another_project_with_disabled_tracker
910	issue = Issue.find(1)	928	issue = Issue.find(1)
911	target = Project.find(2)	929	target = Project.find(2)
@@ -996,6 +1014,48 class IssueTest < ActiveSupport::TestCase
996	end	1014	end
997	end	1015	end
998		1016
		1017	def test_valid_parent_project
		1018	issue = Issue.find(1)
		1019	issue_in_same_project = Issue.find(2)
		1020	issue_in_child_project = Issue.find(5)
		1021	issue_in_grandchild_project = Issue.generate!(:project_id => 6, :tracker_id => 1)
		1022	issue_in_other_child_project = Issue.find(6)
		1023	issue_in_different_tree = Issue.find(4)
		1024
		1025	with_settings :cross_project_subtasks => '' do
		1026	assert_equal true, issue.valid_parent_project?(issue_in_same_project)
		1027	assert_equal false, issue.valid_parent_project?(issue_in_child_project)
		1028	assert_equal false, issue.valid_parent_project?(issue_in_grandchild_project)
		1029	assert_equal false, issue.valid_parent_project?(issue_in_different_tree)
		1030	end
		1031
		1032	with_settings :cross_project_subtasks => 'system' do
		1033	assert_equal true, issue.valid_parent_project?(issue_in_same_project)
		1034	assert_equal true, issue.valid_parent_project?(issue_in_child_project)
		1035	assert_equal true, issue.valid_parent_project?(issue_in_different_tree)
		1036	end
		1037
		1038	with_settings :cross_project_subtasks => 'tree' do
		1039	assert_equal true, issue.valid_parent_project?(issue_in_same_project)
		1040	assert_equal true, issue.valid_parent_project?(issue_in_child_project)
		1041	assert_equal true, issue.valid_parent_project?(issue_in_grandchild_project)
		1042	assert_equal false, issue.valid_parent_project?(issue_in_different_tree)
		1043
		1044	assert_equal true, issue_in_child_project.valid_parent_project?(issue_in_same_project)
		1045	assert_equal true, issue_in_child_project.valid_parent_project?(issue_in_other_child_project)
		1046	end
		1047
		1048	with_settings :cross_project_subtasks => 'descendants' do
		1049	assert_equal true, issue.valid_parent_project?(issue_in_same_project)
		1050	assert_equal false, issue.valid_parent_project?(issue_in_child_project)
		1051	assert_equal false, issue.valid_parent_project?(issue_in_grandchild_project)
		1052	assert_equal false, issue.valid_parent_project?(issue_in_different_tree)
		1053
		1054	assert_equal true, issue_in_child_project.valid_parent_project?(issue)
		1055	assert_equal false, issue_in_child_project.valid_parent_project?(issue_in_other_child_project)
		1056	end
		1057	end
		1058
999	def test_recipients_should_include_previous_assignee	1059	def test_recipients_should_include_previous_assignee
1000	user = User.find(3)	1060	user = User.find(3)
1001	user.members.update_all ["mail_notification = ?", false]	1061	user.members.update_all ["mail_notification = ?", false]

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