meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-18 23:18:15 +00:00
Code Issues Releases Wiki Activity

Merged r23209 and r23210 from trunk to 6.0-stable (#12521).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23211 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2024-11-04 04:57:45 +00:00
commit 764af6c040
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/trackers_controller.rb
View File

@ -91,7 +91,7 @@ class TrackersController < ApplicationController
unless @tracker.issues.empty?
projects = Project.joins(:issues).where(issues: {tracker_id: @tracker.id}).sorted.distinct
links = projects.map do |p|
view_context.link_to(p, project_issues_path(p, set_filter: 1, tracker_id: @tracker.id))
view_context.link_to(p, project_issues_path(p, set_filter: 1, tracker_id: @tracker.id, status_id: '*'))
end.join(', ')
flash[:error] = l(:error_can_not_delete_tracker_html, projects: links.html_safe)
else

2
test/functional/trackers_controller_test.rb
View File

@ -20,7 +20,7 @@
require_relative '../test_helper'
class TrackersControllerTest < Redmine::ControllerTest
fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields, :issue_statuses
fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields, :issue_statuses, :enumerations;
def setup
User.current = nil