瀏覽代碼

Fixed that #reload raises a Stack too deep error with ruby 2.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11497 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/2.4.0
Jean-Philippe Lang 11 年之前
父節點
當前提交
5c1e1ee4bb
共有 4 個文件被更改,包括 8 次插入5 次删除
  1. 2
    1
      app/models/issue.rb
  2. 2
    1
      app/models/project.rb
  3. 2
    1
      app/models/user.rb
  4. 2
    2
      lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb

+ 2
- 1
app/models/issue.rb 查看文件

@@ -184,11 +184,12 @@ class Issue < ActiveRecord::Base
super
end

alias :base_reload :reload
def reload(*args)
@workflow_rule_by_attribute = nil
@assignable_versions = nil
@relations = nil
super
base_reload(*args)
end

# Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields

+ 2
- 1
app/models/project.rb 查看文件

@@ -285,6 +285,7 @@ class Project < ActiveRecord::Base
self.find(*args)
end

alias :base_reload :reload
def reload(*args)
@shared_versions = nil
@rolled_up_versions = nil
@@ -297,7 +298,7 @@ class Project < ActiveRecord::Base
@actions_allowed = nil
@start_date = nil
@due_date = nil
super
base_reload(*args)
end

def to_param

+ 2
- 1
app/models/user.rb 查看文件

@@ -128,10 +128,11 @@ class User < Principal
end
end

alias :base_reload :reload
def reload(*args)
@name = nil
@projects_by_role = nil
super
base_reload(*args)
end

def mail=(arg)

+ 2
- 2
lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb 查看文件

@@ -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)

Loading…
取消
儲存