Merge remote-tracking branch 'upstream/pull/3915'

[rails.git] / app / controllers / traces_controller.rb

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index a9dbc85396cb675381b074c88cfe8503e020fbe1..855bbb78af85bc8fc98a1dfe19731e304e8ed5ec 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -28,7 +28,7 @@ class TracesController < ApplicationController
     @title = if target_user.nil?
                t ".public_traces"
              elsif current_user && current_user == target_user
     @title = if target_user.nil?
                t ".public_traces"
              elsif current_user && current_user == target_user

-               t ".my_traces"
+               t ".my_gps_traces"

              else
                t ".public_traces_from", :user => target_user.display_name
              end
              else
                t ".public_traces_from", :user => target_user.display_name
              end


@@ -69,10 +69,6 @@ class TracesController < ApplicationController
     @target_user = target_user
   end
 
     @target_user = target_user
   end
 

-  def mine
-    redirect_to :action => :index, :display_name => current_user.display_name
-  end
-

   def show
     @trace = Trace.find(params[:id])
 
   def show
     @trace = Trace.find(params[:id])
 


@@ -93,6 +89,20 @@ class TracesController < ApplicationController
     @trace = Trace.new(:visibility => default_visibility)
   end
 
     @trace = Trace.new(:visibility => default_visibility)
   end
 

+  def edit
+    @trace = Trace.find(params[:id])
+
+    if !@trace.visible?
+      head :not_found
+    elsif current_user.nil? || @trace.user != current_user
+      head :forbidden
+    else
+      @title = t ".title", :name => @trace.name
+    end
+  rescue ActiveRecord::RecordNotFound
+    head :not_found
+  end
+

   def create
     @title = t ".upload_trace"
 
   def create
     @title = t ".upload_trace"
 


@@ -109,7 +119,7 @@ class TracesController < ApplicationController
         TraceImporterJob.perform_later(@trace)
         redirect_to :action => :index, :display_name => current_user.display_name
       else
         TraceImporterJob.perform_later(@trace)
         redirect_to :action => :index, :display_name => current_user.display_name
       else

-        flash[:error] = t("traces.create.upload_failed") if @trace.valid?
+        flash[:error] = t(".upload_failed") if @trace.valid?

 
         render :action => "new"
       end
 
         render :action => "new"
       end


@@ -119,7 +129,7 @@ class TracesController < ApplicationController
                          :description => params[:trace][:description],
                          :visibility => params[:trace][:visibility],
                          :inserted => false, :user => current_user,
                          :description => params[:trace][:description],
                          :visibility => params[:trace][:visibility],
                          :inserted => false, :user => current_user,

-                         :timestamp => Time.now.getutc)
+                         :timestamp => Time.now.utc)

       @trace.valid?
       @trace.errors.add(:gpx_file, "can't be blank")
 
       @trace.valid?
       @trace.errors.add(:gpx_file, "can't be blank")
 


@@ -127,42 +137,6 @@ class TracesController < ApplicationController
     end
   end
 
     end
   end
 

-  def data
-    trace = Trace.find(params[:id])
-
-    if trace.visible? && (trace.public? || (current_user && current_user == trace.user))
-      if Acl.no_trace_download(request.remote_ip)
-        head :forbidden
-      elsif request.format == Mime[:xml]
-        send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
-      elsif request.format == Mime[:gpx]
-        send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")
-      elsif trace.file.attached?
-        redirect_to rails_blob_path(trace.file, :disposition => "attachment")
-      else
-        send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
-      end
-    else
-      head :not_found
-    end
-  rescue ActiveRecord::RecordNotFound
-    head :not_found
-  end
-
-  def edit
-    @trace = Trace.find(params[:id])
-
-    if !@trace.visible?
-      head :not_found
-    elsif current_user.nil? || @trace.user != current_user
-      head :forbidden
-    else
-      @title = t ".title", :name => @trace.name
-    end
-  rescue ActiveRecord::RecordNotFound
-    head :not_found
-  end
-

   def update
     @trace = Trace.find(params[:id])
 
   def update
     @trace = Trace.find(params[:id])
 


@@ -199,6 +173,32 @@ class TracesController < ApplicationController
     head :not_found
   end
 
     head :not_found
   end
 

+  def mine
+    redirect_to :action => :index, :display_name => current_user.display_name
+  end
+
+  def data
+    trace = Trace.find(params[:id])
+
+    if trace.visible? && (trace.public? || (current_user && current_user == trace.user))
+      if Acl.no_trace_download(request.remote_ip)
+        head :forbidden
+      elsif request.format == Mime[:xml]
+        send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
+      elsif request.format == Mime[:gpx]
+        send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")
+      elsif trace.file.attached?
+        redirect_to rails_blob_path(trace.file, :disposition => "attachment")
+      else
+        send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
+      end
+    else
+      head :not_found
+    end
+  rescue ActiveRecord::RecordNotFound
+    head :not_found
+  end
+

   def georss
     @traces = Trace.visible_to_all.visible
 
   def georss
     @traces = Trace.visible_to_all.visible
 


@@ -266,7 +266,7 @@ class TracesController < ApplicationController
       :visibility => visibility,
       :inserted => false,
       :user => current_user,
       :visibility => visibility,
       :inserted => false,
       :user => current_user,

-      :timestamp => Time.now.getutc,
+      :timestamp => Time.now.utc,

       :file => file
     )
 
       :file => file
     )