also removes the tracker_id from the "Add new child issue" link in case it doesn't allow parent_issue_id Patch by Jens Kraemer. git-svn-id: http://svn.redmine.org/redmine/trunk@15359 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/3.3.0
@@ -162,9 +162,9 @@ module IssuesHelper | |||
# Returns a link for adding a new subtask to the given issue | |||
def link_to_new_subtask(issue) | |||
attrs = { | |||
:tracker_id => issue.tracker, | |||
:parent_issue_id => issue | |||
} | |||
attrs[:tracker_id] = issue.tracker unless issue.tracker.disabled_core_fields.include?('parent_issue_id') | |||
link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs)) | |||
end | |||
@@ -14,7 +14,7 @@ | |||
<% end %> | |||
<% if @issue.safe_attribute? 'tracker_id' %> | |||
<p><%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true}, | |||
<p><%= f.select :tracker_id, @issue.project.trackers.reject { |t| @issue.new_record? && @issue.parent_issue_id.present? && @issue.tracker_id != t.id && t.disabled_core_fields.include?('parent_issue_id') }.collect {|t| [t.name, t.id]}, {:required => true}, | |||
:onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p> | |||
<% end %> | |||
@@ -2017,6 +2017,23 @@ class IssuesControllerTest < ActionController::TestCase | |||
get :new, :project_id => 'invalid' | |||
assert_response 404 | |||
end | |||
def test_new_with_parent_id_should_only_propose_valid_trackers | |||
@request.session[:user_id] = 2 | |||
t = Tracker.find(3) | |||
assert !t.disabled_core_fields.include?('parent_issue_id') | |||
get :new, :project_id => 1, issue: { parent_issue_id: 1 } | |||
assert_response :success | |||
assert_select 'option', text: /#{t.name}/, count: 1 | |||
t.core_fields = Tracker::CORE_FIELDS - ['parent_issue_id'] | |||
t.save! | |||
assert t.disabled_core_fields.include?('parent_issue_id') | |||
get :new, :project_id => 1, issue: { parent_issue_id: 1 } | |||
assert_response :success | |||
assert_select 'option', text: /#{t.name}/, count: 0 | |||
end | |||
def test_update_form_for_new_issue | |||
@request.session[:user_id] = 2 |