Localisation updates from https://translatewiki.net.

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

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index b488d717aefcefc736d01568889c3b48a8ae8257..23f8ce7ec51c138f903349d7780ab62bf236a276 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -3,13 +3,13 @@ class TracesController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

+  before_action :check_database_readable

 
   authorize_resource
 
 
   authorize_resource
 

-  before_action :check_database_readable
-  before_action :check_database_writable, :only => [:new, :create, :edit, :delete]
+  before_action :check_database_writable, :only => [:new, :create, :edit, :destroy]

   before_action :offline_warning, :only => [:mine, :show]
   before_action :offline_warning, :only => [:mine, :show]

-  before_action :offline_redirect, :only => [:new, :create, :edit, :delete, :data]
+  before_action :offline_redirect, :only => [:new, :create, :edit, :destroy, :data]

 
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
 
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces


@@ -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


@@ -65,19 +65,8 @@ class TracesController < ApplicationController
     @traces = @traces.limit(@page_size)
     @traces = @traces.includes(:user, :tags)
 
     @traces = @traces.limit(@page_size)
     @traces = @traces.includes(:user, :tags)
 

-    # put together SET of tags across traces, for related links
-    tagset = {}
-    @traces.each do |trace|
-      trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here
-      trace.tags.each do |tag|
-        tagset[tag.tag] = tag.tag
-      end
-    end
-

     # final helper vars for view
     @target_user = target_user
     # final helper vars for view
     @target_user = target_user

-    @display_name = target_user.display_name if target_user
-    @all_tags = tagset.values

   end
 
   def mine
   end
 
   def mine


@@ -110,18 +99,14 @@ class TracesController < ApplicationController
     logger.info(params[:trace][:gpx_file].class.name)
 
     if params[:trace][:gpx_file].respond_to?(:read)
     logger.info(params[:trace][:gpx_file].class.name)
 
     if params[:trace][:gpx_file].respond_to?(:read)

-      begin
-        @trace = do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
-                           params[:trace][:description], params[:trace][:visibility])
-      rescue StandardError => ex
-        logger.debug ex
-      end
+      @trace = do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
+                         params[:trace][:description], params[:trace][:visibility])

 
       if @trace.id
         flash[:notice] = t ".trace_uploaded"
         flash[:warning] = t ".traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
 
 
       if @trace.id
         flash[:notice] = t ".trace_uploaded"
         flash[:warning] = t ".traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
 

-        TraceImporterJob.perform_later(@trace) if TRACE_USE_JOB_QUEUE
+        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?
         redirect_to :action => :index, :display_name => current_user.display_name
       else
         flash[:error] = t("traces.create.upload_failed") if @trace.valid?


@@ -134,7 +119,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")
 


@@ -152,6 +137,8 @@ class TracesController < ApplicationController
         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")
         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
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end


@@ -194,7 +181,7 @@ class TracesController < ApplicationController
     head :not_found
   end
 
     head :not_found
   end
 

-  def delete
+  def destroy

     trace = Trace.find(params[:id])
 
     if !trace.visible?
     trace = Trace.find(params[:id])
 
     if !trace.visible?


@@ -205,7 +192,7 @@ class TracesController < ApplicationController
       trace.visible = false
       trace.save
       flash[:notice] = t ".scheduled_for_deletion"
       trace.visible = false
       trace.save
       flash[:notice] = t ".scheduled_for_deletion"

-      TraceDestroyerJob.perform_later(trace) if TRACE_USE_JOB_QUEUE
+      TraceDestroyerJob.perform_later(trace)

       redirect_to :action => :index, :display_name => trace.user.display_name
     end
   rescue ActiveRecord::RecordNotFound
       redirect_to :action => :index, :display_name => trace.user.display_name
     end
   rescue ActiveRecord::RecordNotFound


@@ -228,8 +215,12 @@ class TracesController < ApplicationController
 
     if trace.visible? && trace.inserted?
       if trace.public? || (current_user && current_user == trace.user)
 
     if trace.visible? && trace.inserted?
       if trace.public? || (current_user && current_user == trace.user)

-        expires_in 7.days, :private => !trace.public?, :public => trace.public?
-        send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
+        if trace.icon.attached?
+          redirect_to rails_blob_path(trace.image, :disposition => "inline")
+        else
+          expires_in 7.days, :private => !trace.public?, :public => trace.public?
+          send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
+        end

       else
         head :forbidden
       end
       else
         head :forbidden
       end


@@ -245,8 +236,12 @@ class TracesController < ApplicationController
 
     if trace.visible? && trace.inserted?
       if trace.public? || (current_user && current_user == trace.user)
 
     if trace.visible? && trace.inserted?
       if trace.public? || (current_user && current_user == trace.user)

-        expires_in 7.days, :private => !trace.public?, :public => trace.public?
-        send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
+        if trace.icon.attached?
+          redirect_to rails_blob_path(trace.icon, :disposition => "inline")
+        else
+          expires_in 7.days, :private => !trace.public?, :public => trace.public?
+          send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
+        end

       else
         head :forbidden
       end
       else
         head :forbidden
       end


@@ -263,71 +258,38 @@ class TracesController < ApplicationController
     # Sanitise the user's filename
     name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_")
 
     # Sanitise the user's filename
     name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_")
 

-    # Get a temporary filename...
-    filename = "/tmp/#{rand}"
-
-    # ...and save the uploaded file to that location
-    File.open(filename, "wb") { |f| f.write(file.read) }
-
-    # Create the trace object, falsely marked as already
-    # inserted to stop the import daemon trying to load it
+    # Create the trace object

     trace = Trace.new(
       :name => name,
       :tagstring => tags,
       :description => description,
       :visibility => visibility,
     trace = Trace.new(
       :name => name,
       :tagstring => tags,
       :description => description,
       :visibility => visibility,

-      :inserted => true,
+      :inserted => false,

       :user => current_user,
       :user => current_user,

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

     )
 
     )
 

-    if trace.valid?
-      Trace.transaction do
-        begin
-          # Save the trace object
-          trace.save!
-
-          # Rename the temporary file to the final name
-          FileUtils.mv(filename, trace.trace_name)
-        rescue StandardError
-          # Remove the file as we have failed to update the database
-          FileUtils.rm_f(filename)
-
-          # Pass the exception on
-          raise
-        end
-
-        begin
-          # Clear the inserted flag to make the import daemon load the trace
-          trace.inserted = false
-          trace.save!
-        rescue StandardError
-          # Remove the file as we have failed to update the database
-          FileUtils.rm_f(trace.trace_name)
-
-          # Pass the exception on
-          raise
-        end
+    # Save the trace object
+    if trace.save
+      # Finally save the user's preferred privacy level
+      if pref = current_user.preferences.where(:k => "gps.trace.visibility").first
+        pref.v = visibility
+        pref.save
+      else
+        current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility)

       end
     end
 
       end
     end
 

-    # Finally save the user's preferred privacy level
-    if pref = current_user.preferences.where(:k => "gps.trace.visibility").first
-      pref.v = visibility
-      pref.save
-    else
-      current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
-    end
-

     trace
   end
 
   def offline_warning
     trace
   end
 
   def offline_warning

-    flash.now[:warning] = t "traces.offline_warning.message" if STATUS == :gpx_offline
+    flash.now[:warning] = t "traces.offline_warning.message" if Settings.status == "gpx_offline"

   end
 
   def offline_redirect
   end
 
   def offline_redirect

-    redirect_to :action => :offline if STATUS == :gpx_offline
+    render :action => :offline if Settings.status == "gpx_offline"

   end
 
   def default_visibility
   end
 
   def default_visibility