Use POST when editing GPX trace details

Fixes #1533

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index da273b0ebb390ff42549c9adb30d108e419bbc8e..935862af4766ca30e9da188b227d97f56b528950 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -4,7 +4,7 @@
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 

-<%= form_for @trace, :url => { :action => "edit" } do |f| %>
+<%= form_for @trace, :method => :post, :url => { :action => "edit" } do |f| %>

 
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
 
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>

diff --git a/config/routes.rb b/config/routes.rb
index 59c0dac86458aad9b78cab142e7b745a65ed4d78..a9767231f93b1bc45464f77d45a3e68d1b663437 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -208,7 +208,7 @@ OpenStreetMap::Application.routes.draw do
   match "/traces/mine" => "trace#mine", :via => :get
   match "/trace/create" => "trace#create", :via => [:get, :post]
   match "/trace/:id/data" => "trace#data", :via => :get, :id => /\d+/, :as => "trace_data"
   match "/traces/mine" => "trace#mine", :via => :get
   match "/trace/create" => "trace#create", :via => [:get, :post]
   match "/trace/:id/data" => "trace#data", :via => :get, :id => /\d+/, :as => "trace_data"

-  match "/trace/:id/edit" => "trace#edit", :via => [:get, :post, :patch], :id => /\d+/, :as => "trace_edit"
+  match "/trace/:id/edit" => "trace#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"

   match "/trace/:id/delete" => "trace#delete", :via => :post, :id => /\d+/
 
   # diary pages
   match "/trace/:id/delete" => "trace#delete", :via => :post, :id => /\d+/
 
   # diary pages

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index bbd26bf27ef14b65934d9f36742cfd6b3a8e8002..9821352e18e2256b5f46b7c8b44f618e1cffb708 100644 (file)
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -157,10 +157,6 @@ class TraceControllerTest < ActionController::TestCase
       { :path => "/trace/1/edit", :method => :post },
       { :controller => "trace", :action => "edit", :id => "1" }
     )
       { :path => "/trace/1/edit", :method => :post },
       { :controller => "trace", :action => "edit", :id => "1" }
     )

-    assert_routing(
-      { :path => "/trace/1/edit", :method => :patch },
-      { :controller => "trace", :action => "edit", :id => "1" }
-    )

     assert_routing(
       { :path => "/trace/1/delete", :method => :post },
       { :controller => "trace", :action => "delete", :id => "1" }
     assert_routing(
       { :path => "/trace/1/delete", :method => :post },
       { :controller => "trace", :action => "delete", :id => "1" }