Fix file_column plugin to generate absolute URLs without falling over
in a heap and then use that in the user details view.
This commit is contained in:
parent
783748b1e5
commit
e72ebb7eac
2 changed files with 2 additions and 4 deletions
|
@ -12,9 +12,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
|
|||
:zoom => @user.home_zoom
|
||||
end
|
||||
if @user.image
|
||||
# i'd love to use "url_for_file_column, :absolute=>true", but that doesn't seem
|
||||
# to work with the file_column plugin version we're using.
|
||||
xml.tag! "img", :href => ("http://" + SERVER_URL + url_for_file_column(@user, "image"))
|
||||
xml.tag! "img", :href => (url_for_file_column(@user, "image", :absolute => true))
|
||||
end
|
||||
if @user.languages
|
||||
xml.tag! "languages" do
|
||||
|
|
|
@ -76,7 +76,7 @@ module FileColumnHelper
|
|||
return nil unless relative_path
|
||||
|
||||
url = ""
|
||||
url << request.relative_url_root.to_s if absolute
|
||||
url << request.protocol << request.host_with_port if absolute
|
||||
url << "/"
|
||||
url << object.send("#{method}_options")[:base_url] << "/"
|
||||
url << relative_path
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue