Allow notes to be reopened from the web interface

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

diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb
index 0fcb113269ea475fef4438d747ccee8eb9c69e26..49324966f506c2624f0055d9f02fc5f82f2e6911 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -1,10 +1,11 @@
 class OldRelationTag < ActiveRecord::Base
-  set_table_name 'relation_tags'
+  self.table_name = "relation_tags"
+  self.primary_keys = "relation_id", "version", "k"
+
+  belongs_to :old_relation, :foreign_key => [:relation_id, :version]
   
-  belongs_to :old_relation, :foreign_key => [:id, :version]
-  
-  validates_presence_of :id, :version
-  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :id, :scope => [:k, :version]
-  validates_numericality_of :id, :version, :only_integer => true
+  validates_presence_of :old_relation
+  validates_length_of :k, :maximum => 255, :allow_blank => true
+  validates_uniqueness_of :k, :scope => [:relation_id, :version]
+  validates_length_of :v, :maximum => 255, :allow_blank => true
 end