diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/principal.rb | 2 | ||||
| -rw-r--r-- | app/models/wiki_content.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/principal.rb b/app/models/principal.rb index f2bec0e26..32e330aed 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 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 :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name" diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index 1787a7898..ac7459826 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -18,7 +18,7 @@ require 'zlib' class WikiContent < ActiveRecord::Base - set_locking_column :version + self.locking_column = 'version' belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id' belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' validates_presence_of :text |