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

Merged r9384, r9385 from trunk. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9386 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-11 17:27:44 +00:00
parent 4c82fbb6f8
commit a4c0c18e3d
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issue_relations_controller.rb
View File

@ -42,7 +42,7 @@ class IssueRelationsController < ApplicationController
def create
@relation = IssueRelation.new(params[:relation])
@relation.issue_from = @issue
if params[:relation] && m = params[:relation][:issue_to_id].to_s.match(/^#?(\d+)$/)
if params[:relation] && m = params[:relation][:issue_to_id].to_s.strip.match(/^#?(\d+)$/)
@relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
end
saved = @relation.save

19
test/functional/issue_relations_controller_test.rb
View File

@ -48,6 +48,10 @@ class IssueRelationsControllerTest < ActionController::TestCase
post :create, :issue_id => 1,
:relation => {:issue_to_id => '2', :relation_type => 'relates', :delay => ''}
end
relation = IssueRelation.first(:order => 'id DESC')
assert_equal 1, relation.issue_from_id
assert_equal 2, relation.issue_to_id
assert_equal 'relates', relation.relation_type
end
def test_create_xhr
@ -61,6 +65,9 @@ class IssueRelationsControllerTest < ActionController::TestCase
assert_select 'tr', 2 # relations
end
end
relation = IssueRelation.first(:order => 'id DESC')
assert_equal 3, relation.issue_from_id
assert_equal 1, relation.issue_to_id
end
def test_create_should_accept_id_with_hash
@ -69,6 +76,18 @@ class IssueRelationsControllerTest < ActionController::TestCase
post :create, :issue_id => 1,
:relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
end
relation = IssueRelation.first(:order => 'id DESC')
assert_equal 2, relation.issue_to_id
end
def test_create_should_strip_id
assert_difference 'IssueRelation.count' do
@request.session[:user_id] = 3
post :create, :issue_id => 1,
:relation => {:issue_to_id => ' 2 ', :relation_type => 'relates', :delay => ''}
end
relation = IssueRelation.first(:order => 'id DESC')
assert_equal 2, relation.issue_to_id
end
def test_create_should_not_break_with_non_numerical_id