aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2012-09-06 10:56:29 +0200
committerMarc Florisson2012-09-06 10:56:29 +0200
commitce7ff510359ac68e8ad521b1b23daed6832fa479 (patch)
tree1c1ef948564b7a0e682966faef38f91ed5bb5369
parent65f44388bd45b3d996e527e2abd19f4543aa00a7 (diff)
downloadchouette-core-ce7ff510359ac68e8ad521b1b23daed6832fa479.tar.bz2
fix relative_url_root
-rw-r--r--app/helpers/users_helper.rb2
-rw-r--r--app/maps/application_map.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index acf511ac6..ad45433c1 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -5,7 +5,7 @@ module UsersHelper
end
def user_default_avatar
- image_path('icons/user.png')
+ "#{root_url}#{image_path('icons/user.png')}"
end
end
diff --git a/app/maps/application_map.rb b/app/maps/application_map.rb
index fd7862186..6aae9c927 100644
--- a/app/maps/application_map.rb
+++ b/app/maps/application_map.rb
@@ -112,8 +112,8 @@ class ApplicationMap
def open_layer_path
relative_url_root = Rails.application.config.relative_url_root
- return "openlayers/" unless relative_url_root
- "#{relative_url_root}/openlayers/"
+ return "/assets/openlayers/" unless relative_url_root
+ "#{relative_url_root}/assets/openlayers/"
end
def polymorphic_path_patch( source)