diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 1ba4c4635..2cc387ff8 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -65,7 +65,7 @@ module IssuesHelper s = '' ancestors = issue.root? ? [] : issue.ancestors.visible.all ancestors.each do |ancestor| - s << '
<%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %>
-<%= 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' %> diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb index 6c9bf4553..a8d004daa 100644 --- a/app/views/settings/_issues.html.erb +++ b/app/views/settings/_issues.html.erb @@ -3,6 +3,8 @@<%= setting_check_box :cross_project_issue_relations %>
+<%= setting_select :cross_project_subtasks, cross_project_subtasks_options %>
+<%= setting_check_box :issue_group_assignment %>
<%= setting_check_box :default_issue_start_date_to_creation_date %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 50373ed83..050ee0279 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -357,6 +357,7 @@ en: 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 diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2aa9ab1ee..6c6067b84 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -356,6 +356,7 @@ fr: 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 diff --git a/config/settings.yml b/config/settings.yml index 01906609f..6aa224166 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -133,6 +133,9 @@ user_format: 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: diff --git a/test/fixtures/projects_trackers.yml b/test/fixtures/projects_trackers.yml index 4766a9f82..2c5707c5e 100644 --- a/test/fixtures/projects_trackers.yml +++ b/test/fixtures/projects_trackers.yml @@ -41,4 +41,7 @@ projects_trackers_013: projects_trackers_014: project_id: 1 tracker_id: 3 +projects_trackers_015: + project_id: 6 + tracker_id: 1 \ No newline at end of file diff --git a/test/test_helper.rb b/test/test_helper.rb index 12e70b9bf..66a6f2646 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -156,6 +156,14 @@ class ActiveSupport::TestCase 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 diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb index 6716759b5..921cddc99 100644 --- a/test/unit/issue_nested_set_test.rb +++ b/test/unit/issue_nested_set_test.rb @@ -49,7 +49,15 @@ class IssueNestedSetTest < ActiveSupport::TestCase assert_equal [parent.id, parent.id, 2, 3], [child.root_id, child.parent_id, child.lft, child.rgt] end - def test_creating_a_child_in_different_project_should_not_validate + def test_creating_a_child_in_a_subproject_should_validate + issue = create_issue! + child = Issue.new(:project_id => 3, :tracker_id => 2, :author_id => 1, + :subject => 'child', :parent_issue_id => issue.id) + assert_save child + assert_equal issue, child.reload.parent + end + + def test_creating_a_child_in_an_invalid_project_should_not_validate issue = create_issue! child = Issue.new(:project_id => 2, :tracker_id => 1, :author_id => 1, :subject => 'child', :parent_issue_id => issue.id) diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 7fdd9cf0f..4bd718de1 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -906,6 +906,24 @@ class IssueTest < ActiveSupport::TestCase assert_equal 7, issue.fixed_version_id end + def test_move_to_another_project_should_keep_parent_if_valid + issue = Issue.find(1) + issue.update_attribute(:parent_issue_id, 2) + issue.project = Project.find(3) + assert issue.save + issue.reload + assert_equal 2, issue.parent_id + end + + def test_move_to_another_project_should_clear_parent_if_not_valid + issue = Issue.find(1) + issue.update_attribute(:parent_issue_id, 2) + issue.project = Project.find(2) + assert issue.save + issue.reload + assert_nil issue.parent_id + end + def test_move_to_another_project_with_disabled_tracker issue = Issue.find(1) target = Project.find(2) @@ -996,6 +1014,48 @@ class IssueTest < ActiveSupport::TestCase end end + def test_valid_parent_project + issue = Issue.find(1) + issue_in_same_project = Issue.find(2) + issue_in_child_project = Issue.find(5) + issue_in_grandchild_project = Issue.generate!(:project_id => 6, :tracker_id => 1) + issue_in_other_child_project = Issue.find(6) + issue_in_different_tree = Issue.find(4) + + with_settings :cross_project_subtasks => '' do + assert_equal true, issue.valid_parent_project?(issue_in_same_project) + assert_equal false, issue.valid_parent_project?(issue_in_child_project) + assert_equal false, issue.valid_parent_project?(issue_in_grandchild_project) + assert_equal false, issue.valid_parent_project?(issue_in_different_tree) + end + + with_settings :cross_project_subtasks => 'system' do + assert_equal true, issue.valid_parent_project?(issue_in_same_project) + assert_equal true, issue.valid_parent_project?(issue_in_child_project) + assert_equal true, issue.valid_parent_project?(issue_in_different_tree) + end + + with_settings :cross_project_subtasks => 'tree' do + assert_equal true, issue.valid_parent_project?(issue_in_same_project) + assert_equal true, issue.valid_parent_project?(issue_in_child_project) + assert_equal true, issue.valid_parent_project?(issue_in_grandchild_project) + assert_equal false, issue.valid_parent_project?(issue_in_different_tree) + + assert_equal true, issue_in_child_project.valid_parent_project?(issue_in_same_project) + assert_equal true, issue_in_child_project.valid_parent_project?(issue_in_other_child_project) + end + + with_settings :cross_project_subtasks => 'descendants' do + assert_equal true, issue.valid_parent_project?(issue_in_same_project) + assert_equal false, issue.valid_parent_project?(issue_in_child_project) + assert_equal false, issue.valid_parent_project?(issue_in_grandchild_project) + assert_equal false, issue.valid_parent_project?(issue_in_different_tree) + + assert_equal true, issue_in_child_project.valid_parent_project?(issue) + assert_equal false, issue_in_child_project.valid_parent_project?(issue_in_other_child_project) + end + end + def test_recipients_should_include_previous_assignee user = User.find(3) user.members.update_all ["mail_notification = ?", false]