X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2201a7ff32c7269ea32db455a2f038b02ea3cd4f..ea2baaee3b6cb6fbc92b87d313be00c69d3fc914:/app/controllers/trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 47a31d314..33f6d0df7 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,6 +1,7 @@
 class TraceController < ApplicationController
   layout 'site'
 
+  before_filter :set_locale
   before_filter :authorize_web
   before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
   before_filter :authorize, :only => [:api_details, :api_data, :api_create]
@@ -60,6 +61,8 @@ class TraceController < ApplicationController
 
       if files.length > 0
         conditions[0] += " AND gpx_files.id IN (#{files.join(',')})"
+      else
+        conditions[0] += " AND 0 = 1"
       end
     end
     
@@ -90,6 +93,13 @@ class TraceController < ApplicationController
   end
 
   def mine
+    # Load the preference of whether the user set the trace public the last time
+    @trace = Trace.new
+    if @user.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}).nil?
+      @trace.public = false
+    else 
+      @trace.public = true
+    end
     list(@user, "mine")
   end