Make sure we clear the tags and segments for a way when it is deleted.

Also remove some redundant setting of timestamps that will be overwritten
by the model when saving.

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 7a841769b9df77f997972bcb7d26a6d79ba3ec22..3f3f882ae6cb5971c8c951da5e214f0d9a6f943b 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,7 +1,7 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
 class NodeController < ApplicationController
   require 'xml/libxml'
 

-  before_filter :authorize, :only => [:create, :update, :destroy]
+  before_filter :authorize, :only => [:create, :update, :delete]

   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create


@@ -49,9 +49,7 @@ class NodeController < ApplicationController
         new_node = Node.from_xml(request.raw_post)
 
         if new_node and new_node.id == node.id
         new_node = Node.from_xml(request.raw_post)
 
         if new_node and new_node.id == node.id

-          node.timestamp = Time.now

           node.user_id = @user.id
           node.user_id = @user.id

-

           node.latitude = new_node.latitude 
           node.longitude = new_node.longitude
           node.tags = new_node.tags
           node.latitude = new_node.latitude 
           node.longitude = new_node.longitude
           node.tags = new_node.tags

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 31738ce139df4410d50e20d158edf79865714b07..2d55bbf79bc737dd609d829fa0cd7d12a23cd2f4 100644 (file)
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -1,7 +1,7 @@
 class SegmentController < ApplicationController
   require 'xml/libxml'
 
 class SegmentController < ApplicationController
   require 'xml/libxml'
 

-  before_filter :authorize, :only => [:create, :update, :destroy]
+  before_filter :authorize, :only => [:create, :update, :delete]

   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create


@@ -61,7 +61,6 @@ class SegmentController < ApplicationController
           elsif !new_segment.preconditions_ok?
             render :nothing => true, :status => :precondition_failed
           else
           elsif !new_segment.preconditions_ok?
             render :nothing => true, :status => :precondition_failed
           else

-            segment.timestamp = Time.now

             segment.user_id = @user.id
             segment.node_a = new_segment.node_a
             segment.node_b = new_segment.node_b
             segment.user_id = @user.id
             segment.node_a = new_segment.node_a
             segment.node_b = new_segment.node_b

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 42219d9b0fce74a0f1be6ed05a4b070d0eecf94d..ea22206a3c8e66a65b7db803a423274c1378e567 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,7 +1,7 @@
 class WayController < ApplicationController
   require 'xml/libxml'
 
 class WayController < ApplicationController
   require 'xml/libxml'
 

-  before_filter :authorize, :only => [:create, :update, :destroy]
+  before_filter :authorize, :only => [:create, :update, :delete]

   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create


@@ -58,7 +58,6 @@ class WayController < ApplicationController
             way.user_id = @user.id
             way.tags = new_way.tags
             way.segs = new_way.segs
             way.user_id = @user.id
             way.tags = new_way.tags
             way.segs = new_way.segs

-            way.timestamp = new_way.timestamp

             way.visible = true
 
             if way.save_with_history
             way.visible = true
 
             if way.save_with_history


@@ -86,6 +85,8 @@ class WayController < ApplicationController
 
       if way.visible
         way.user_id = @user.id
 
       if way.visible
         way.user_id = @user.id

+        way.tags = []
+        way.segs = []

         way.visible = false
 
         if way.save_with_history
         way.visible = false
 
         if way.save_with_history