kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed that entering #nnn as parent task should validate (#11979). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10658 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-10-14 14:35:57 +00:00
parent 5aaf9c734c
commit 4b6b568635
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/issue.rb
View File

@ -416,7 +416,8 @@ class Issue < ActiveRecord::Base
end end
if attrs['parent_issue_id'].present? if attrs['parent_issue_id'].present?
unless Issue.visible(user).exists?(attrs['parent_issue_id'].to_i) s = attrs['parent_issue_id'].to_s
unless (m = s.match(%r{\A#?(\d+)\z})) && Issue.visible(user).exists?(m[1])
@invalid_parent_issue_id = attrs.delete('parent_issue_id') @invalid_parent_issue_id = attrs.delete('parent_issue_id')
end end
end end

20
test/functional/issues_controller_test.rb
View File

@ -1940,12 +1940,24 @@ class IssuesControllerTest < ActionController::TestCase
post :create, :project_id => 1, post :create, :project_id => 1,
:issue => {:tracker_id => 1, :issue => {:tracker_id => 1,
:subject => 'This is a child issue', :subject => 'This is a child issue',
:parent_issue_id => 2} :parent_issue_id => '2'}
assert_response 302 assert_response 302
end end
issue = Issue.find_by_subject('This is a child issue') issue = Issue.order('id DESC').first
assert_not_nil issue assert_equal Issue.find(2), issue.parent
end
def test_post_create_subissue_with_sharp_parent_id
@request.session[:user_id] = 2
assert_difference 'Issue.count' do
post :create, :project_id => 1,
:issue => {:tracker_id => 1,
:subject => 'This is a child issue',
:parent_issue_id => '#2'}
assert_response 302
end
issue = Issue.order('id DESC').first
assert_equal Issue.find(2), issue.parent assert_equal Issue.find(2), issue.parent
end end