Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-14 09:16:02 +01:00
Code Issues Packages Projects Releases Activity

Fix related issues count not updating after deleting one of the related issues (#38493).

Browse Source 
Patch by Takashi Kato.


git-svn-id: https://svn.redmine.org/redmine/trunk@22395 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2023-10-29 07:31:01 +00:00
parent c8b201b111
commit 36a7932003
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/issue_relations_controller.rb
View File

@@ -68,7 +68,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 do 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 @unsaved_relations = unsaved_relations
end end
format.api do format.api do
@@ -89,7 +89,10 @@ class IssueRelationsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html {redirect_to issue_path(@relation.issue_from)} 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} format.api {render_api_ok}
end end
end end
@@ -123,4 +126,8 @@ class IssueRelationsController < ApplicationController
# ToDo: Find a better method to return an error if the param is missing. # ToDo: Find a better method to return an error if the param is missing.
[''] ['']
end end
def select_relations(issue)
issue.reload.relations.select {|r| r.other_issue(issue) && r.other_issue(issue).visible?}
end
end end

2
app/helpers/issues_helper.rb
View File

@@ -208,7 +208,7 @@ module IssuesHelper
if manage_relations if manage_relations
link_to( link_to(
l(:label_relation_delete), l(:label_relation_delete),
relation_path(relation), relation_path(relation, issue_id: issue.id),
:remote => true, :remote => true,
:method => :delete, :method => :delete,
:data => {:confirm => l(:text_are_you_sure)}, :data => {:confirm => l(:text_are_you_sure)},

1
app/views/issue_relations/destroy.js.erb
View File

@@ -1 +1,2 @@
$('#relation-<%= @relation.id %>').remove(); $('#relation-<%= @relation.id %>').remove();
$(".issues-stat").replaceWith('<%= escape_javascript(render_relations_stats(@issue, @relations)) %>')

2
test/functional/issue_relations_controller_test.rb
View File

@@ -316,7 +316,7 @@ class IssueRelationsControllerTest < Redmine::ControllerTest
end end
assert_difference 'IssueRelation.count', -1 do assert_difference 'IssueRelation.count', -1 do
delete(:destroy, :params => {:id => '2'}, :xhr => true) delete(:destroy, :params => {:id => '2', :issue_id => '2'}, :xhr => true)
assert_response :success assert_response :success
assert_equal 'text/javascript', response.media_type assert_equal 'text/javascript', response.media_type
assert_include 'relation-2', response.body assert_include 'relation-2', response.body