meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Do not propose trackers which disallow parent_issue_id for new child issues (#22345).

Browse Source 
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-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-04-24 15:22:18 +00:00
parent 6376762917
commit 83d4c9c50b
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/issues_helper.rb
View File

@ -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

2
app/views/issues/_form.html.erb
View File

@ -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 %>

17
test/functional/issues_controller_test.rb
View File

@ -2018,6 +2018,23 @@ class IssuesControllerTest < ActionController::TestCase
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
xhr :post, :new, :project_id => 1,