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

Use only_path instead of setting an explicit host

Browse source
This commit is contained in:
Tom Hughes 2016-11-24 20:33:36 +00:00
parent 1309661b15
commit 34c473f503
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/open_graph_helper.rb
View file

@ -6,7 +6,7 @@ module OpenGraphHelper
"og:type" => "website", "og:type" => "website",
"og:image" => image_url("osm_logo_256.png", :protocol => "http"), "og:image" => image_url("osm_logo_256.png", :protocol => "http"),
"og:image:secure_url" => image_url("osm_logo_256.png", :protocol => "https"), "og:image:secure_url" => image_url("osm_logo_256.png", :protocol => "https"),
"og:url" => url_for(:host => SERVER_URL), "og:url" => url_for(:only_path => false),
"og:description" => t("layouts.intro_text") "og:description" => t("layouts.intro_text")
} }

10
app/views/diary_entry/rss.rss.builder
View file

@ -7,24 +7,24 @@ xml.rss("version" => "2.0",
xml.channel do xml.channel do
xml.title @title xml.title @title
xml.description @description xml.description @description
xml.link url_for(:action => "list", :host => SERVER_URL) xml.link url_for(:action => "list", :only_path => false)
xml.image do xml.image do
xml.url image_url("mag_map-rss2.0.png") xml.url image_url("mag_map-rss2.0.png")
xml.title @title xml.title @title
xml.width "100" xml.width "100"
xml.height "100" xml.height "100"
xml.link url_for(:action => "list", :host => SERVER_URL) xml.link url_for(:action => "list", :only_path => false)
end end
@entries.each do |entry| @entries.each do |entry|
xml.item do xml.item do
xml.title entry.title xml.title entry.title
xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL) xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL) xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
xml.description entry.body.to_html xml.description entry.body.to_html
xml.dc :creator, entry.user.display_name xml.dc :creator, entry.user.display_name
xml.pubDate entry.created_at.to_s(:rfc822) xml.pubDate entry.created_at.to_s(:rfc822)
xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL) xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false)
if entry.latitude && entry.longitude if entry.latitude && entry.longitude
xml.geo :lat, entry.latitude.to_s xml.geo :lat, entry.latitude.to_s

2
app/views/notes/_note.gpx.builder
View file

@ -6,7 +6,7 @@ xml.wpt("lon" => note.lon, "lat" => note.lat) do
xml.cdata! render(:partial => "description", :object => note, :formats => [:html]) xml.cdata! render(:partial => "description", :object => note, :formats => [:html])
end end
xml.link("href" => browse_note_url(note, :host => SERVER_URL)) xml.link("href" => browse_note_url(note, :only_path => false))
xml.extensions do xml.extensions do
xml.id note.id xml.id note.id

2
app/views/notes/_note.json.jsonify
View file

@ -26,7 +26,7 @@ json.properties do
if comment.author if comment.author
json.uid comment.author.id json.uid comment.author.id
json.user comment.author.display_name json.user comment.author.display_name
json.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL) json.user_url user_url(:display_name => comment.author.display_name, :only_path => false)
end end
json.action comment.event json.action comment.event

2
app/views/notes/_note.xml.builder
View file

@ -22,7 +22,7 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
if comment.author if comment.author
xml.uid comment.author.id xml.uid comment.author.id
xml.user comment.author.display_name xml.user comment.author.display_name
xml.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL) xml.user_url user_url(:display_name => comment.author.display_name, :only_path => false)
end end
xml.action comment.event xml.action comment.event

2
test/controllers/notes_controller_test.rb
View file

@ -545,7 +545,7 @@ class NotesControllerTest < ActionController::TestCase
assert_select "time", :count => 1 assert_select "time", :count => 1
assert_select "name", "Note: #{open_note.id}" assert_select "name", "Note: #{open_note.id}"
assert_select "desc", :count => 1 assert_select "desc", :count => 1
assert_select "link[href='http://www.openstreetmap.org/note/#{open_note.id}']", :count => 1 assert_select "link[href='http://test.host/note/#{open_note.id}']", :count => 1
assert_select "extensions", :count => 1 do assert_select "extensions", :count => 1 do
assert_select "id", open_note.id.to_s assert_select "id", open_note.id.to_s
assert_select "url", note_url(open_note, :format => "gpx") assert_select "url", note_url(open_note, :format => "gpx")