kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set_table_name and set_locking_column are deprecated. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9549 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-27 16:28:35 +00:00
parent d2f779d6e8
commit d940797aa7
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/principal.rb
View File

@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class Principal < ActiveRecord::Base class Principal < ActiveRecord::Base
set_table_name "#{table_name_prefix}users#{table_name_suffix}" self.table_name = "#{table_name_prefix}users#{table_name_suffix}"
has_many :members, :foreign_key => 'user_id', :dependent => :destroy has_many :members, :foreign_key => 'user_id', :dependent => :destroy
has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name" has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"

2
app/models/wiki_content.rb
View File

@ -18,7 +18,7 @@
require 'zlib' require 'zlib'
class WikiContent < ActiveRecord::Base class WikiContent < ActiveRecord::Base
set_locking_column :version self.locking_column = 'version'
belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id' belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
validates_presence_of :text validates_presence_of :text

2
lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb
View File

@ -273,7 +273,7 @@ module ActiveRecord #:nodoc:
versioned_class.cattr_accessor :original_class versioned_class.cattr_accessor :original_class
versioned_class.original_class = self versioned_class.original_class = self
versioned_class.set_table_name versioned_table_name versioned_class.table_name = versioned_table_name
versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym, versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym,
:class_name => "::#{self.to_s}", :class_name => "::#{self.to_s}",
:foreign_key => versioned_foreign_key :foreign_key => versioned_foreign_key

2
lib/plugins/open_id_authentication/lib/open_id_authentication/association.rb
View File

@ -1,6 +1,6 @@
module OpenIdAuthentication module OpenIdAuthentication
class Association < ActiveRecord::Base class Association < ActiveRecord::Base
set_table_name :open_id_authentication_associations self.table_name = :open_id_authentication_associations
def from_record def from_record
OpenID::Association.new(handle, secret, issued, lifetime, assoc_type) OpenID::Association.new(handle, secret, issued, lifetime, assoc_type)

2
lib/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
View File

@ -1,5 +1,5 @@
module OpenIdAuthentication module OpenIdAuthentication
class Nonce < ActiveRecord::Base class Nonce < ActiveRecord::Base
set_table_name :open_id_authentication_nonces self.table_name = :open_id_authentication_nonces
end end
end end