Use safe_attributes for custom field enumerations.

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

1 files changed, 11 insertions, 1 deletions

diff --git a/app/models/custom_field_enumeration.rb b/app/models/custom_field_enumeration.rb
index b7b3cd60b..6cc9daae9 100644
--- a/app/models/custom_field_enumeration.rb
+++ b/app/models/custom_field_enumeration.rb
@@ -16,6 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CustomFieldEnumeration < ActiveRecord::Base
+  include Redmine::SafeAttributes
+
   belongs_to :custom_field
   attr_accessible :name, :active, :position
 
@@ -26,6 +28,10 @@ class CustomFieldEnumeration < ActiveRecord::Base
 
   scope :active, lambda { where(:active => true) }
 
+  safe_attributes 'name',
+    'active',
+    'position'
+
   def to_s
     name.to_s
   end
@@ -56,7 +62,11 @@ class CustomFieldEnumeration < ActiveRecord::Base
       attributes.each do |enumeration_id, enumeration_attributes|
         enumeration = custom_field.enumerations.find_by_id(enumeration_id)
         if enumeration
-          enumeration.attributes = enumeration_attributes
+          if block_given?
+            yield enumeration, enumeration_attributes
+          else
+            enumeration.attributes = enumeration_attributes
+          end
           unless enumeration.save
             raise ActiveRecord::Rollback
           end