meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Don't require category or target version when they are not available (#20583).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14733 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-10-24 06:22:55 +00:00
parent aeab970972
commit 68620da79a
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue.rb
View File

@ -677,6 +677,8 @@ class Issue < ActiveRecord::Base
end end
else else
if respond_to?(attribute) && send(attribute).blank? && !disabled_core_fields.include?(attribute) if respond_to?(attribute) && send(attribute).blank? && !disabled_core_fields.include?(attribute)
next if attribute == 'category_id' && project.try(:issue_categories).blank?
next if attribute == 'fixed_version_id' && assignable_versions.blank?
errors.add attribute, :blank errors.add attribute, :blank
end end
end end

24
test/unit/issue_test.rb
View File

@ -926,6 +926,30 @@ class IssueTest < ActiveSupport::TestCase
assert issue.save assert issue.save
end end
def test_category_should_not_be_required_if_project_has_no_categories
Project.find(1).issue_categories.delete_all
WorkflowPermission.delete_all
WorkflowPermission.create!(:old_status_id => 1, :tracker_id => 1,
:role_id => 1, :field_name => 'category_id',:rule => 'required')
user = User.find(2)
issue = Issue.new(:project_id => 1, :tracker_id => 1, :status_id => 1,
:subject => 'Required fields', :author => user)
assert_save issue
end
def test_fixed_version_should_not_be_required_no_assignable_versions
Version.delete_all
WorkflowPermission.delete_all
WorkflowPermission.create!(:old_status_id => 1, :tracker_id => 1,
:role_id => 1, :field_name => 'fixed_version_id',:rule => 'required')
user = User.find(2)
issue = Issue.new(:project_id => 1, :tracker_id => 1, :status_id => 1,
:subject => 'Required fields', :author => user)
assert_save issue
end
def test_required_custom_field_that_is_not_visible_for_the_user_should_not_be_required def test_required_custom_field_that_is_not_visible_for_the_user_should_not_be_required
CustomField.delete_all CustomField.delete_all
field = IssueCustomField.generate!(:is_required => true, :visible => false, :role_ids => [1], :trackers => Tracker.all, :is_for_all => true) field = IssueCustomField.generate!(:is_required => true, :visible => false, :role_ids => [1], :trackers => Tracker.all, :is_for_all => true)