some useful notes in code for ideas that require implementing.

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 03ae64f41939a4c9f4e4dcd92895a3ab33044b40..bfd1031f04a671c285b3bed33163004eca7b3f36 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -87,6 +87,11 @@ class NodeController < ApplicationController
   def delete
     begin
       node = Node.find(params[:id])
+      # FIXME we no longer care about the user, (or maybe we want to check
+      # that the user of the changeset is the same user as is making this
+      # little change?) we really care about the 
+      # changeset which must be open, and that the version that we have been
+      # given is the one that is currently stored in the database
       node.delete_with_history(@user)
 
       render :nothing => true

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 04023ae2b94a6f883966b4aead228ac57508d439..7e2216f0e501165c6e2f1b2b870f52eb70e6b991 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -11,6 +11,15 @@ class Changeset < ActiveRecord::Base
   has_many :old_nodes
   has_many :old_ways
   has_many :old_relations
+  
+  validates_presence_of :user_id, :created_at, :open
+  
+  # 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
@@ -83,6 +92,7 @@ class Changeset < ActiveRecord::Base
     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

diff --git a/test/functional/node_controller_test.rb b/test/functional/node_controller_test.rb
index 3f316d01224e9d63aae5a3823f89b9f58ff078f0..59b28e114100f17002fcf543253d41553599d5e1 100644 (file)
--- a/test/functional/node_controller_test.rb
+++ b/test/functional/node_controller_test.rb
@@ -15,7 +15,9 @@ class NodeControllerTest < Test::Unit::TestCase
 
   def test_create
     # cannot read password from fixture as it is stored as MD5 digest
-    basic_authorization("test@openstreetmap.org", "test");  
+    basic_authorization(users(:normal_user).email, "test");
+    # FIXME we need to create a changeset first argh
+    
     # create a node with random lat/lon
     lat = rand(100)-50 + rand
     lon = rand(100)-50 + rand