Merged r11461, r11462 from trunk (#13251).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11463 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-02-24 10:06:27 +00:00
parent e6d63a4e0d
commit 92507382b4
3 changed files with 15 additions and 2 deletions

View File

@ -50,7 +50,7 @@ class IssueRelationsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { redirect_to issue_path(@issue) } format.html { redirect_to issue_path(@issue) }
format.js { format.js {
@relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } @relations = @issue.reload.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
} }
format.api { format.api {
if saved if saved

View File

@ -187,6 +187,7 @@ class Issue < ActiveRecord::Base
def reload(*args) def reload(*args)
@workflow_rule_by_attribute = nil @workflow_rule_by_attribute = nil
@assignable_versions = nil @assignable_versions = nil
@relations = nil
super super
end end

View File

@ -28,7 +28,8 @@ class IssueRelationsControllerTest < ActionController::TestCase
:issue_relations, :issue_relations,
:enabled_modules, :enabled_modules,
:enumerations, :enumerations,
:trackers :trackers,
:projects_trackers
def setup def setup
User.current = nil User.current = nil
@ -87,6 +88,17 @@ class IssueRelationsControllerTest < ActionController::TestCase
end end
end end
def test_create_follows_relation_should_update_relations_list
issue1 = Issue.generate!(:subject => 'Followed issue', :start_date => Date.yesterday, :due_date => Date.today)
issue2 = Issue.generate!
assert_difference 'IssueRelation.count' do
xhr :post, :create, :issue_id => issue2.id,
:relation => {:issue_to_id => issue1.id, :relation_type => 'follows', :delay => ''}
end
assert_match /Followed issue/, response.body
end
def test_should_create_relations_with_visible_issues_only def test_should_create_relations_with_visible_issues_only
Setting.cross_project_issue_relations = '1' Setting.cross_project_issue_relations = '1'
assert_nil Issue.visible(User.find(3)).find_by_id(4) assert_nil Issue.visible(User.find(3)).find_by_id(4)