From 34c473f503679242538fe6aa335796f1aae914b5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 24 Nov 2016 20:33:36 +0000 Subject: [PATCH] Use only_path instead of setting an explicit host --- app/helpers/open_graph_helper.rb | 2 +- app/views/diary_entry/rss.rss.builder | 10 +++++----- app/views/notes/_note.gpx.builder | 2 +- app/views/notes/_note.json.jsonify | 2 +- app/views/notes/_note.xml.builder | 2 +- test/controllers/notes_controller_test.rb | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb index ac1a57219..ab7e230cb 100644 --- a/app/helpers/open_graph_helper.rb +++ b/app/helpers/open_graph_helper.rb @@ -6,7 +6,7 @@ module OpenGraphHelper "og:type" => "website", "og:image" => image_url("osm_logo_256.png", :protocol => "http"), "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") } diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder index 6d1b1def4..6ff2ed9f3 100644 --- a/app/views/diary_entry/rss.rss.builder +++ b/app/views/diary_entry/rss.rss.builder @@ -7,24 +7,24 @@ xml.rss("version" => "2.0", xml.channel do xml.title @title 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.url image_url("mag_map-rss2.0.png") xml.title @title xml.width "100" xml.height "100" - xml.link url_for(:action => "list", :host => SERVER_URL) + xml.link url_for(:action => "list", :only_path => false) end @entries.each do |entry| xml.item do xml.title entry.title - xml.link 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, :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, :only_path => false) xml.description entry.body.to_html xml.dc :creator, entry.user.display_name 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 xml.geo :lat, entry.latitude.to_s diff --git a/app/views/notes/_note.gpx.builder b/app/views/notes/_note.gpx.builder index 9d8ede249..f6bb39d27 100644 --- a/app/views/notes/_note.gpx.builder +++ b/app/views/notes/_note.gpx.builder @@ -6,7 +6,7 @@ xml.wpt("lon" => note.lon, "lat" => note.lat) do xml.cdata! render(:partial => "description", :object => note, :formats => [:html]) 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.id note.id diff --git a/app/views/notes/_note.json.jsonify b/app/views/notes/_note.json.jsonify index 74ff5ccec..5e3ac518e 100644 --- a/app/views/notes/_note.json.jsonify +++ b/app/views/notes/_note.json.jsonify @@ -26,7 +26,7 @@ json.properties do if comment.author json.uid comment.author.id 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 json.action comment.event diff --git a/app/views/notes/_note.xml.builder b/app/views/notes/_note.xml.builder index fb6738aaa..adb4e6a52 100644 --- a/app/views/notes/_note.xml.builder +++ b/app/views/notes/_note.xml.builder @@ -22,7 +22,7 @@ xml.note("lon" => note.lon, "lat" => note.lat) do if comment.author xml.uid comment.author.id 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 xml.action comment.event diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb index 4b1d9f4ad..ab63bbca2 100644 --- a/test/controllers/notes_controller_test.rb +++ b/test/controllers/notes_controller_test.rb @@ -545,7 +545,7 @@ class NotesControllerTest < ActionController::TestCase assert_select "time", :count => 1 assert_select "name", "Note: #{open_note.id}" 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 "id", open_note.id.to_s assert_select "url", note_url(open_note, :format => "gpx") -- 2.43.2