From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Aug 2008 18:09:54 +0000 (+0000)
Subject: Allow same name for custom fields on different object types.
X-Git-Tag: 0.8.0-RC1~300
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1631019026089cb7dc49b50365274bb07ba44025;p=redmine.git

Allow same name for custom fields on different object types.

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

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 990adf9e2..7ad19437f 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -30,7 +30,7 @@ class CustomField < ActiveRecord::Base
   }.freeze
 
   validates_presence_of :name, :field_format
-  validates_uniqueness_of :name
+  validates_uniqueness_of :name, :scope => :type
   validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
   validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys