cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/1857'

Browse source
This commit is contained in:
Tom Hughes 2018-05-14 20:13:41 +01:00
commit 33ea119c8f
17 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api_controller.rb
View file

@ -67,7 +67,7 @@ class ApiController < ApplicationController
if gpx_file.identifiable?
track << (XML::Node.new("name") << gpx_file.name)
track << (XML::Node.new("desc") << gpx_file.description)
track << (XML::Node.new("url") << url_for(:controller => "trace", :action => "view", :display_name => gpx_file.user.display_name, :id => gpx_file.id))
track << (XML::Node.new("url") << url_for(:controller => "traces", :action => "view", :display_name => gpx_file.user.display_name, :id => gpx_file.id))
end
else
# use the anonymous track segment if the user hasn't allowed

6
app/controllers/trace_controller.rb → app/controllers/traces_controller.rb
View file

@ -1,4 +1,4 @@
class TraceController < ApplicationController
class TracesController < ApplicationController
layout "site", :except => :georss
skip_before_action :verify_authenticity_token, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
@ -167,7 +167,7 @@ class TraceController < ApplicationController
elsif current_user.nil? || @trace.user != current_user
head :forbidden
else
@title = t "trace.edit.title", :name => @trace.name
@title = t ".title", :name => @trace.name
if request.post? && params[:trace]
@trace.description = params[:trace][:description]
@ -384,7 +384,7 @@ class TraceController < ApplicationController
end
def offline_warning
flash.now[:warning] = t "trace.offline_warning.message" if STATUS == :gpx_offline
flash.now[:warning] = t "traces.offline_warning.message" if STATUS == :gpx_offline
end
def offline_redirect