Select the language for Potlatch indepdently of the web site.

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 03aff0fc6a578f4d9814929ee1a8e64051c7d910..5e3638347a642a55ec8e33ca180012532709233b 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -4,10 +4,15 @@ class OldNode < ActiveRecord::Base
 
   set_table_name 'nodes'
   
 
   set_table_name 'nodes'
   

+  # Should probably have the composite primary key set in the model
+  # however there are some weird bugs happening when you do
+  #set_primary_keys :id, :version
+  

   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position

+  validates_associated :changeset

 
   belongs_to :changeset
  
 
   belongs_to :changeset
  


@@ -92,11 +97,7 @@ class OldNode < ActiveRecord::Base
   end
 
   def tags_as_hash 
   end
 
   def tags_as_hash 

-    hash = {} 
-    Tags.split(self.tags) do |k,v| 
-      hash[k] = v 
-    end 
-    hash 
+    return self.tags

   end 
  
   # Pretend we're not in any ways 
   end 
  
   # Pretend we're not in any ways