From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Aug 2010 20:32:07 +0000 (+0100)
Subject: Set the default trace visibility on the upload form
X-Git-Tag: live~6269^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ba70c100f158c0e4aecedd8de43b0df0759c8e5c?ds=inline

Set the default trace visibility on the upload form
---

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 1a75ac4cc..3777621a4 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -105,7 +105,6 @@ class TraceController < ApplicationController
     @target_user = target_user
     @display_name = target_user.display_name if target_user
     @all_tags = tagset.values
-    @trace = Trace.new(:visibility => default_visibility) if @user
   end
 
   def mine
@@ -130,6 +129,7 @@ class TraceController < ApplicationController
   def create
     if params[:trace]
       logger.info(params[:trace][:gpx_file].class.name)
+
       if params[:trace][:gpx_file].respond_to?(:read)
         begin
           do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
@@ -158,7 +158,10 @@ class TraceController < ApplicationController
         @trace.valid?
         @trace.errors.add(:gpx_file, "can't be blank")
       end
+    else
+      @trace = Trace.new(:visibility => default_visibility)
     end
+
     @title = t 'trace.create.upload_trace'
   end