Put back missing divider. Closes #1939.

[rails.git] / app / models / diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 33e95d17508057e3a9447a238a4e3faaeed7e296..705438213628fe9fbb001cc608f7500968280ed4 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,6 +1,6 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user

-  belongs_to :language, :foreign_key => 'language'
+  belongs_to :language, :foreign_key => 'language_code'

   
   has_many :diary_comments, :include => :user,
                             :conditions => ["users.visible = ?", true],
   
   has_many :diary_comments, :include => :user,
                             :conditions => ["users.visible = ?", true],


@@ -14,4 +14,5 @@ class DiaryEntry < ActiveRecord::Base
   validates_numericality_of :longitude, :allow_nil => true,
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :user
   validates_numericality_of :longitude, :allow_nil => true,
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :user

+  validates_associated :language

 end
 end