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.
This commit is contained in:
parent
97d5d1d385
commit
7901811752
3 changed files with 5 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
|||
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
|
||||
|
@ -49,9 +49,7 @@ class NodeController < ApplicationController
|
|||
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.latitude = new_node.latitude
|
||||
node.longitude = new_node.longitude
|
||||
node.tags = new_node.tags
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
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
|
||||
|
@ -61,7 +61,6 @@ class SegmentController < ApplicationController
|
|||
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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
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
|
||||
|
@ -58,7 +58,6 @@ class WayController < ApplicationController
|
|||
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
|
||||
|
@ -86,6 +85,8 @@ class WayController < ApplicationController
|
|||
|
||||
if way.visible
|
||||
way.user_id = @user.id
|
||||
way.tags = []
|
||||
way.segs = []
|
||||
way.visible = false
|
||||
|
||||
if way.save_with_history
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue