Merged r10221 from trunk to 1.4-stable (#11665)
force set default document category if it is not set on database. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10225 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -31,4 +31,12 @@ class DocumentCategory < Enumeration
|
|||||||
def transfer_relations(to)
|
def transfer_relations(to)
|
||||||
documents.update_all("category_id = #{to.id}")
|
documents.update_all("category_id = #{to.id}")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.default
|
||||||
|
d = super
|
||||||
|
if d.nil?
|
||||||
|
d = find(:first)
|
||||||
|
end
|
||||||
|
d
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -38,4 +38,8 @@ class DocumentCategoryTest < ActiveSupport::TestCase
|
|||||||
e.update_attributes(:is_default => true)
|
e.update_attributes(:is_default => true)
|
||||||
assert_equal 3, DocumentCategory.default.id
|
assert_equal 3, DocumentCategory.default.id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_force_default
|
||||||
|
assert_equal 1, DocumentCategory.default.id
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user