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

Don't propose projects without trackers when editing an issue (#20463).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14613 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-09-20 11:38:01 +00:00
parent a5de0fec9e
commit 671fce04de
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue.rb
View File

@@ -1386,7 +1386,7 @@ class Issue < ActiveRecord::Base
if current_project if current_project
condition = ["(#{condition}) OR #{Project.table_name}.id = ?", current_project.id] condition = ["(#{condition}) OR #{Project.table_name}.id = ?", current_project.id]
end end
Project.where(condition) Project.where(condition).having_trackers
end end
private private

3
app/models/project.rb
View File

@@ -110,6 +110,9 @@ class Project < ActiveRecord::Base
end end
} }
scope :sorted, lambda {order(:lft)} scope :sorted, lambda {order(:lft)}
scope :having_trackers, lambda {
where("#{Project.table_name}.id IN (SELECT DISTINCT project_id FROM #{table_name_prefix}projects_trackers#{table_name_suffix})")
}
def initialize(attributes=nil, *args) def initialize(attributes=nil, *args)
super super

6
test/unit/issue_test.rb
View File

@@ -1331,6 +1331,12 @@ class IssueTest < ActiveSupport::TestCase
assert_not_include Project.find(2), Issue.allowed_target_projects(User.find(2)) assert_not_include Project.find(2), Issue.allowed_target_projects(User.find(2))
end end
def test_allowed_target_projects_should_not_include_projects_without_trackers
project = Project.generate!(:tracker_ids => [])
assert project.trackers.empty?
assert_not_include project, Issue.allowed_target_projects(User.find(1))
end
def test_move_to_another_project_with_same_category def test_move_to_another_project_with_same_category
issue = Issue.find(1) issue = Issue.find(1)
issue.project = Project.find(2) issue.project = Project.find(2)