X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/43776279fb7bb1103a52ee72af2b3497a1274995..5f59845575ed313688eca669fd73f4f6a5993c23:/app/controllers/traces_controller.rb?ds=sidebyside diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb index ab4c8f3b8..b488d717a 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] + + authorize_resource + + before_action :check_database_readable + before_action :check_database_writable, :only => [:new, :create, :edit, :delete] + before_action :offline_warning, :only => [:mine, :show] + before_action :offline_redirect, :only => [:new, :create, :edit, :delete, :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? @@ -86,22 +81,22 @@ class TracesController < ApplicationController 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 @@ -126,7 +121,8 @@ class TracesController < ApplicationController 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 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? @@ -175,13 +171,24 @@ 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 @@ -198,7 +205,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 TRACE_USE_JOB_QUEUE + redirect_to :action => :index, :display_name => trace.user.display_name end rescue ActiveRecord::RecordNotFound head :not_found @@ -249,86 +257,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) - trace = 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) @@ -413,4 +341,8 @@ class TracesController < ApplicationController "public" end end + + def trace_params + params.require(:trace).permit(:description, :tagstring, :visibility) + end end