Allow to disable description field in tracker setting (#25052).

Patch by Go MAEDA and Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16351 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 2dcbaed04b519482fbcfd283c04ee530b3253e02..9c19111b17bee38a5f1dee86b0ed06b6d411b1c0 100644 (file)
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -18,10 +18,10 @@
 class Tracker < ActiveRecord::Base
   include Redmine::SafeAttributes
 
-  CORE_FIELDS_UNDISABLABLE = %w(project_id tracker_id subject description priority_id is_private).freeze
+  CORE_FIELDS_UNDISABLABLE = %w(project_id tracker_id subject priority_id is_private).freeze
   # Fields that can be disabled
   # Other (future) fields should be appended, not inserted!
-  CORE_FIELDS = %w(assigned_to_id category_id fixed_version_id parent_issue_id start_date due_date estimated_hours done_ratio).freeze
+  CORE_FIELDS = %w(assigned_to_id category_id fixed_version_id parent_issue_id start_date due_date estimated_hours done_ratio description).freeze
   CORE_FIELDS_ALL = (CORE_FIELDS_UNDISABLABLE + CORE_FIELDS).freeze
 
   before_destroy :check_integrity

diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 235e2e7f7f51bf3b7f52c3219d09c975c214304e..60ba42f80873d1f144d4a467ab7d90029f1d92fe 100644 (file)
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -810,7 +810,6 @@ class IssueTest < ActiveSupport::TestCase
     assert_include 'tracker_id', issue.safe_attribute_names
     assert_include 'status_id', issue.safe_attribute_names
     assert_include 'subject', issue.safe_attribute_names
-    assert_include 'description', issue.safe_attribute_names
     assert_include 'custom_field_values', issue.safe_attribute_names
     assert_include 'custom_fields', issue.safe_attribute_names
     assert_include 'lock_version', issue.safe_attribute_names