summaryrefslogtreecommitdiffstats
path: root/app/models/wiki_content.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-10-22 18:41:03 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-10-22 18:41:03 +0000
commit498a34403ad3f15dee2067e9d8998675255010ce (patch)
tree4157bab01de3ac07d5d076cc3eeb988df1d2a993 /app/models/wiki_content.rb
parent0fc1906201be897fb1d7b1424cd3955f0e224eb4 (diff)
downloadredmine-498a34403ad3f15dee2067e9d8998675255010ce.tar.gz
redmine-498a34403ad3f15dee2067e9d8998675255010ce.zip
Removed unneeded :foreign_key option on belongs_to associations.
git-svn-id: http://svn.redmine.org/redmine/trunk@13484 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/wiki_content.rb')
-rw-r--r--app/models/wiki_content.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 3eac92688..9377ccfc2 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -19,8 +19,8 @@ require 'zlib'
class WikiContent < ActiveRecord::Base
self.locking_column = 'version'
- belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
- belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+ belongs_to :page, :class_name => 'WikiPage'
+ belongs_to :author, :class_name => 'User'
validates_presence_of :text
validates_length_of :comments, :maximum => 255, :allow_nil => true
attr_protected :id
@@ -54,8 +54,8 @@ class WikiContent < ActiveRecord::Base
end
class Version
- belongs_to :page, :class_name => '::WikiPage', :foreign_key => 'page_id'
- belongs_to :author, :class_name => '::User', :foreign_key => 'author_id'
+ belongs_to :page, :class_name => '::WikiPage'
+ belongs_to :author, :class_name => '::User'
attr_protected :data
acts_as_event :title => Proc.new {|o| "#{l(:label_wiki_edit)}: #{o.page.title} (##{o.version})"},