Merged r22395 from trunk to 5.1-stable (#38493).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22396 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 9 insertions, 2 deletions

diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb
index 91297ac76..519cb9922 100644
--- a/app/controllers/issue_relations_controller.rb
+++ b/app/controllers/issue_relations_controller.rb
@@ -68,7 +68,7 @@ class IssueRelationsController < ApplicationController
     respond_to do |format|
       format.html {redirect_to issue_path(@issue)}
       format.js do
-        @relations = @issue.reload.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible?}
+        @relations = select_relations(@issue)
         @unsaved_relations = unsaved_relations
       end
       format.api do
@@ -89,7 +89,10 @@ class IssueRelationsController < ApplicationController
 
     respond_to do |format|
       format.html {redirect_to issue_path(@relation.issue_from)}
-      format.js
+      format.js do
+        find_issue
+        @relations = select_relations(@issue)
+      end
       format.api  {render_api_ok}
     end
   end
@@ -123,4 +126,8 @@ class IssueRelationsController < ApplicationController
     # ToDo: Find a better method to return an error if the param is missing.
     ['']
   end
+
+  def select_relations(issue)
+    issue.reload.relations.select {|r| r.other_issue(issue) && r.other_issue(issue).visible?}
+  end
 end