X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1df4ad819cb5151d1bdd7bb98cf4833d219bd09d..45f12aa99e9f9634b5494c9f56a5a92168c62305:/app/controllers/trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 99f11d546..4c4ec60a7 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -96,20 +96,11 @@ class TraceController < ApplicationController
     @action = action
     @display_name = target_user.display_name if target_user
     @all_tags = tagset.values
+    @trace = Trace.new(:visibility => default_visibility) if @user
   end
 
   def mine
-    # Load the preference of whether the user set the trace public the last time
-    @trace = Trace.new
-    visibility = @user.preferences.find(:first, :conditions => {:k => "gps.trace.visibility"})
-    if visibility
-      @trace.visibility = visibility.v
-    elsif @user.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}).nil?
-      @trace.visibility = "private"
-    else
-      @trace.visibility = "public"
-    end
-    list(@user, "mine")
+    redirect_to :action => :list, :display_name => @user.display_name
   end
 
   def view
@@ -398,4 +389,16 @@ private
     redirect_to :action => :offline if OSM_STATUS == :gpx_offline
   end
 
+  def default_visibility
+    visibility = @user.preferences.find(:first, :conditions => {:k => "gps.trace.visibility"})
+
+    if visibility
+      visibility.v
+    elsif @user.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}).nil?
+      "private"
+    else
+      "public"
+    end
+  end
+
 end