Adding a lower and upper length on various web site varchar fields. Fixes one test.

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 9b92c62ead7547a6b11def8998abf608e344b793..dc6c0e01446ec4340f6cd98e6ea801d2ed1c9531 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -4,6 +4,23 @@ class Changeset < ActiveRecord::Base
   belongs_to :user
 
   has_many :changeset_tags, :foreign_key => 'id'
   belongs_to :user
 
   has_many :changeset_tags, :foreign_key => 'id'

+  
+  has_many :nodes
+  has_many :ways
+  has_many :relations
+  has_many :old_nodes
+  has_many :old_ways
+  has_many :old_relations
+  
+  validates_presence_of :user_id, :created_at
+  validates_inclusion_of :open, :in => [ true, false ]
+  
+  # Use a method like this, so that we can easily change how we
+  # determine whether a changeset is open, without breaking code in at 
+  # least 6 controllers
+  def is_open?
+    return open
+  end

 
   def self.from_xml(xml, create=false)
     begin
 
   def self.from_xml(xml, create=false)
     begin


@@ -30,6 +47,10 @@ class Changeset < ActiveRecord::Base
     return cs
   end
 
     return cs
   end
 

+  def tags_as_hash
+    return tags
+  end
+

   def tags
     unless @tags
       @tags = {}
   def tags
     unless @tags
       @tags = {}


@@ -54,6 +75,7 @@ class Changeset < ActiveRecord::Base
 
     Changeset.transaction do
       # fixme update modified_at time?
 
     Changeset.transaction do
       # fixme update modified_at time?

+      # FIXME there is no modified_at time, should it be added

       self.save!
     end
 
       self.save!
     end
 


@@ -76,6 +98,7 @@ class Changeset < ActiveRecord::Base
     doc.root << to_xml_node()
     return doc
   end
     doc.root << to_xml_node()
     return doc
   end

+  

   def to_xml_node(user_display_name_cache = nil)
     el1 = XML::Node.new 'changeset'
     el1['id'] = self.id.to_s
   def to_xml_node(user_display_name_cache = nil)
     el1 = XML::Node.new 'changeset'
     el1['id'] = self.id.to_s


@@ -100,6 +123,7 @@ class Changeset < ActiveRecord::Base
     end
     
     el1['created_at'] = self.created_at.xmlschema
     end
     
     el1['created_at'] = self.created_at.xmlschema

+    el1['open'] = self.open.to_s

 
     # FIXME FIXME FIXME: This does not include changes yet! There is 
     # currently no changeset_id column in the tables as far as I can tell,
 
     # FIXME FIXME FIXME: This does not include changes yet! There is 
     # currently no changeset_id column in the tables as far as I can tell,