From f4a7d6ca8cd2a3bc1f40f0e8c54d95f3dfa91117 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 21 Aug 2012 17:15:38 +0000
Subject: [PATCH] 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
---
 app/models/document_category.rb     | 8 ++++++++
 test/unit/document_category_test.rb | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/app/models/document_category.rb b/app/models/document_category.rb
index 59aa08ce6..216891c25 100644
--- a/app/models/document_category.rb
+++ b/app/models/document_category.rb
@@ -31,4 +31,12 @@ class DocumentCategory < Enumeration
   def transfer_relations(to)
     documents.update_all("category_id = #{to.id}")
   end
+
+  def self.default
+    d = super
+    if d.nil?
+      d = find(:first)
+    end
+    d
+  end
 end
diff --git a/test/unit/document_category_test.rb b/test/unit/document_category_test.rb
index 452ab1aa0..07b6c597b 100644
--- a/test/unit/document_category_test.rb
+++ b/test/unit/document_category_test.rb
@@ -38,4 +38,8 @@ class DocumentCategoryTest < ActiveSupport::TestCase
     e.update_attributes(:is_default => true)
     assert_equal 3, DocumentCategory.default.id
   end
+
+  def test_force_default
+    assert_equal 1, DocumentCategory.default.id
+  end
 end