Merged r11497 from trunk (#13329).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11574 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-03-09 10:59:22 +00:00
parent ddf0307718
commit 53680edb2d
4 changed files with 8 additions and 5 deletions

View File

@@ -33,7 +33,6 @@ module Redmine
:dependent => :delete_all,
:validate => false
send :alias_method, :reload_without_custom_fields, :reload
send :include, Redmine::Acts::Customizable::InstanceMethods
validate :validate_custom_field_values
after_save :save_custom_field_values
@@ -43,6 +42,7 @@ module Redmine
module InstanceMethods
def self.included(base)
base.extend ClassMethods
base.send :alias_method_chain, :reload, :custom_fields
end
def available_custom_fields
@@ -154,7 +154,7 @@ module Redmine
@custom_field_values_changed = true
end
def reload(*args)
def reload_with_custom_fields(*args)
@custom_field_values = nil
@custom_field_values_changed = false
reload_without_custom_fields(*args)