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, :create, :edit, :delete]
+ 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 => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
+ 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 => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data]
+ before_action :offline_warning, :only => [:mine, :show]
+ 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]
# 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?
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
+ @title = t ".upload_trace"
+ @trace = Trace.new(:visibility => default_visibility)
end
def create
- if request.post?
- logger.info(params[:trace][:gpx_file].class.name)
+ @title = t ".upload_trace"
- 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
- end
+ logger.info(params[:trace][:gpx_file].class.name)
- 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 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
- redirect_to :action => :list, :display_name => current_user.display_name
- 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 => :index, :display_name => current_user.display_name
else
- @trace = Trace.new(:name => "Dummy",
- :tagstring => params[:trace][:tagstring],
- :description => params[:trace][:description],
- :visibility => params[:trace][:visibility],
- :inserted => false, :user => current_user,
- :timestamp => Time.now.getutc)
- @trace.valid?
- @trace.errors.add(:gpx_file, "can't be blank")
+ flash[:error] = t("traces.create.upload_failed") if @trace.valid?
+
+ render :action => "new"
end
else
- @trace = Trace.new(:visibility => default_visibility)
+ @trace = Trace.new(:name => "Dummy",
+ :tagstring => params[:trace][:tagstring],
+ :description => params[:trace][:description],
+ :visibility => params[:trace][:visibility],
+ :inserted => false, :user => current_user,
+ :timestamp => Time.now.getutc)
+ @trace.valid?
+ @trace.errors.add(:gpx_file, "can't be blank")
+
+ render :action => "new"
end
-
- @title = t ".upload_trace"
end
def data
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
trace.visible = false
trace.save
flash[:notice] = t ".scheduled_for_deletion"
- redirect_to :action => :list, :display_name => trace.user.display_name
+ redirect_to :action => :index, :display_name => trace.user.display_name
end
rescue ActiveRecord::RecordNotFound
head :not_found
visibility = params[:visibility]
if visibility.nil?
- visibility = if params[:public] && params[:public].to_i.nonzero?
+ visibility = if params[:public]&.to_i&.nonzero?
"public"
else
"private"
end
if params[:file].respond_to?(:read)
- do_create(params[:file], tags, description, visibility)
+ trace = do_create(params[:file], tags, description, visibility)
- if @trace.id
- render :plain => @trace.id.to_s
- elsif @trace.valid?
+ if trace.id
+ render :plain => trace.id.to_s
+ elsif trace.valid?
head :internal_server_error
else
head :bad_request
# 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,
:timestamp => Time.now.getutc
)
- Trace.transaction do
- begin
- # Save the trace object
- @trace.save!
+ 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)
+ # 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
+ # 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
+ 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
else
current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
end
+
+ trace
end
def offline_warning
"public"
end
end
+
+ def trace_params
+ params.require(:trace).permit(:description, :tagstring, :visibility)
+ end
end
projects / rails.git / blobdiff