Track users in piwik

diff --git a/app/assets/javascripts/piwik.js b/app/assets/javascripts/piwik.js
index a48e903add43ee638029805e80323307b20fc596..d327296f63621e97aacecd7e4b7bdbd043134540 100644 (file)
--- a/app/assets/javascripts/piwik.js
+++ b/app/assets/javascripts/piwik.js
@@ -10,6 +10,10 @@ if (OSM.PIWIK) {
       success: function () {
         piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site);
       
+        if (OSM.user) {
+          piwikTracker.setUserId(OSM.user);
+        }
+
         piwikTracker.trackPageView();
         piwikTracker.enableLinkTracking();
       

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 1c91e68ec1aac9cd28cbbeb4eb7cbff753cc8209..b879d90bdec74318f3b387813fb37a0e0ebdd347 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -32,9 +32,12 @@
     I18n.defaultLocale = "<%= I18n.default_locale %>";
     I18n.locale = "<%= I18n.locale %>";
     I18n.fallbacks = true;
-    <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? -%>
+    <% if @user -%>
+    OSM.user = <%= @user.id.to_json.html_safe %>;
+    <% unless @user.home_lon.nil? or @user.home_lat.nil? -%>
     OSM.home = <%= { :lat => @user.home_lat, :lon => @user.home_lon }.to_json.html_safe %>;
     <% end -%>
+    <% end -%>
     <% if session[:location] -%>
     OSM.location = <%= session[:location].to_json.html_safe %>;
     <% end -%>