X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/57d3b3af55a0bb37eb964aa75a9f1549df9a771c..cde4ac61a26b43d32b8dd919feaa944a1d6ee4de:/app/controllers/traces_controller.rb diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb index 8994d8a2e..0d3a1aa33 100644 --- a/app/controllers/traces_controller.rb +++ b/app/controllers/traces_controller.rb @@ -1,24 +1,19 @@ class TracesController < ApplicationController layout "site", :except => :georss - skip_before_action :verify_authenticity_token, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] before_action :authorize_web before_action :set_locale - before_action :require_user, :only => [:mine, :new, :create, :edit, :delete] - before_action :authorize, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] - before_action :check_database_readable, :except => [:api_read, :api_data] - before_action :check_database_writable, :only => [:new, :create, :edit, :delete, :api_create, :api_update, :api_delete] - before_action :check_api_readable, :only => [:api_read, :api_data] - before_action :check_api_writable, :only => [:api_create, :api_update, :api_delete] - before_action :require_allow_read_gpx, :only => [:api_read, :api_data] - before_action :require_allow_write_gpx, :only => [:api_create, :api_update, :api_delete] - before_action :offline_warning, :only => [:mine, :view] - before_action :offline_redirect, :only => [:new, :create, :edit, :delete, :data, :api_create, :api_delete, :api_data] - around_action :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] + before_action :check_database_readable + + authorize_resource + + before_action :check_database_writable, :only => [:new, :create, :edit, :destroy] + before_action :offline_warning, :only => [:mine, :show] + 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 - def list + def index # from display name, pick up user id if one user's traces only display_name = params[:display_name] if display_name.present? @@ -70,38 +65,28 @@ class TracesController < ApplicationController @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 @display_name = target_user.display_name if target_user - @all_tags = tagset.values end def mine - redirect_to :action => :list, :display_name => current_user.display_name + redirect_to :action => :index, :display_name => current_user.display_name end - def view + def show @trace = Trace.find(params[:id]) - if @trace && @trace.visible? && - (@trace.public? || @trace.user == current_user) + if @trace&.visible? && + (@trace&.public? || @trace&.user == current_user) @title = t ".title", :name => @trace.name else flash[:error] = t ".trace_not_found" - redirect_to :action => "list" + redirect_to :action => "index" end rescue ActiveRecord::RecordNotFound flash[:error] = t ".trace_not_found" - redirect_to :action => "list" + redirect_to :action => "index" end def new @@ -110,21 +95,28 @@ class TracesController < ApplicationController end def create + @title = t ".upload_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], - params[:trace][:description], params[:trace][:visibility]) - rescue StandardError => ex - logger.debug ex + @trace = do_create(params[:trace][:gpx_file], params[:trace][:tagstring], + params[:trace][:description], params[:trace][:visibility]) + rescue StandardError => e + logger.debug e end 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 - redirect_to :action => :list, :display_name => current_user.display_name + TraceImporterJob.perform_later(@trace) if Settings.trace_use_job_queue + redirect_to :action => :index, :display_name => current_user.display_name + else + flash[:error] = t("traces.create.upload_failed") if @trace.valid? + + render :action => "new" end else @trace = Trace.new(:name => "Dummy", @@ -135,7 +127,7 @@ class TracesController < ApplicationController :timestamp => Time.now.getutc) @trace.valid? @trace.errors.add(:gpx_file, "can't be blank") - @title = t ".upload_trace" + render :action => "new" end end @@ -169,19 +161,30 @@ class TracesController < ApplicationController head :forbidden else @title = t ".title", :name => @trace.name + end + rescue ActiveRecord::RecordNotFound + head :not_found + end - if request.post? && params[:trace] - @trace.description = params[:trace][:description] - @trace.tagstring = params[:trace][:tagstring] - @trace.visibility = params[:trace][:visibility] - redirect_to :action => "view", :display_name => current_user.display_name if @trace.save - end + def update + @trace = Trace.find(params[:id]) + + if !@trace.visible? + head :not_found + elsif current_user.nil? || @trace.user != current_user + head :forbidden + elsif @trace.update(trace_params) + flash[:notice] = t ".updated" + redirect_to :action => "show", :display_name => current_user.display_name + else + @title = t ".title", :name => @trace.name + render :action => "edit" end rescue ActiveRecord::RecordNotFound head :not_found end - def delete + def destroy trace = Trace.find(params[:id]) if !trace.visible? @@ -192,7 +195,8 @@ class TracesController < ApplicationController trace.visible = false trace.save flash[:notice] = t ".scheduled_for_deletion" - redirect_to :action => :list, :display_name => trace.user.display_name + TraceDestroyerJob.perform_later(trace) if Settings.trace_use_job_queue + redirect_to :action => :index, :display_name => trace.user.display_name end rescue ActiveRecord::RecordNotFound head :not_found @@ -243,86 +247,6 @@ class TracesController < ApplicationController head :not_found end - def api_read - trace = Trace.visible.find(params[:id]) - - if trace.public? || trace.user == current_user - render :xml => trace.to_xml.to_s - else - head :forbidden - end - end - - def api_update - trace = Trace.visible.find(params[:id]) - - if trace.user == current_user - trace.update_from_xml(request.raw_post) - trace.save! - - head :ok - else - head :forbidden - end - end - - def api_delete - trace = Trace.visible.find(params[:id]) - - if trace.user == current_user - trace.visible = false - trace.save! - - head :ok - else - head :forbidden - end - end - - def api_data - trace = Trace.visible.find(params[:id]) - - if trace.public? || trace.user == current_user - if 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") - else - send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") - end - else - head :forbidden - end - end - - def api_create - tags = params[:tags] || "" - description = params[:description] || "" - visibility = params[:visibility] - - if visibility.nil? - visibility = if params[:public] && params[:public].to_i.nonzero? - "public" - else - "private" - end - end - - if params[:file].respond_to?(:read) - do_create(params[:file], tags, description, visibility) - - if @trace.id - render :plain => @trace.id.to_s - elsif @trace.valid? - head :internal_server_error - else - head :bad_request - end - else - head :bad_request - end - end - private def do_create(file, tags, description, visibility) @@ -337,7 +261,7 @@ class TracesController < ApplicationController # Create the trace object, falsely marked as already # inserted to stop the import daemon trying to load it - @trace = Trace.new( + trace = Trace.new( :name => name, :tagstring => tags, :description => description, @@ -347,31 +271,33 @@ class TracesController < ApplicationController :timestamp => Time.now.getutc ) - 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 + 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 end end @@ -382,14 +308,16 @@ class TracesController < ApplicationController else current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility) end + + 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 - redirect_to :action => :offline if STATUS == :gpx_offline + render :action => :offline if Settings.status == "gpx_offline" end def default_visibility @@ -403,4 +331,8 @@ class TracesController < ApplicationController "public" end end + + def trace_params + params.require(:trace).permit(:description, :tagstring, :visibility) + end end