X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/041059690882d6420fd8bd087bb28e5cb2ea9123..9619e699e1daf2ec1127cdf0bba7ffe2aa3bbb0c:/app/controllers/traces_controller.rb?ds=sidebyside diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb index a9dbc8539..0b7dbc94a 100644 --- 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 - t ".my_traces" + t ".my_gps_traces" else t ".public_traces_from", :user => target_user.display_name end @@ -40,39 +40,43 @@ class TracesController < ApplicationController # 2 - all traces, not logged in = all public traces # 3 - user's traces, logged in as same user = all user's traces # 4 - user's traces, not logged in as that user = all user's public traces - @traces = if target_user.nil? # all traces - if current_user - Trace.visible_to(current_user) # 1 - else - Trace.visible_to_all # 2 - end - elsif current_user && current_user == target_user - current_user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name) - else - target_user.traces.visible_to_all # 4 - end + traces = if target_user.nil? # all traces + if current_user + Trace.visible_to(current_user) # 1 + else + Trace.visible_to_all # 2 + end + elsif current_user && current_user == target_user + current_user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name) + else + target_user.traces.visible_to_all # 4 + end - @traces = @traces.tagged(params[:tag]) if params[:tag] + traces = traces.tagged(params[:tag]) if params[:tag] - @params = params.permit(:display_name, :tag) + traces = traces.visible - @page = (params[:page] || 1).to_i - @page_size = 20 + @params = params.permit(:display_name, :tag, :before, :after) - @traces = @traces.visible - @traces = @traces.order(:id => :desc) - @traces = @traces.offset((@page - 1) * @page_size) - @traces = @traces.limit(@page_size) + @traces = if params[:before] + traces.where("gpx_files.id < ?", params[:before]).order(:id => :desc) + elsif params[:after] + traces.where("gpx_files.id > ?", params[:after]).order(:id => :asc) + else + traces.order(:id => :desc) + end + + @traces = @traces.limit(20) @traces = @traces.includes(:user, :tags) + @traces = @traces.sort.reverse + + @newer_traces = @traces.count.positive? && traces.exists?(["gpx_files.id > ?", @traces.first.id]) + @older_traces = @traces.count.positive? && traces.exists?(["gpx_files.id < ?", @traces.last.id]) # final helper vars for view @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]) @@ -93,6 +97,20 @@ class TracesController < ApplicationController @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" @@ -109,7 +127,7 @@ class TracesController < ApplicationController 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 @@ -119,7 +137,7 @@ class TracesController < ApplicationController :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") @@ -127,42 +145,6 @@ class TracesController < ApplicationController 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]) @@ -199,6 +181,32 @@ class TracesController < ApplicationController 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 @@ -266,7 +274,7 @@ class TracesController < ApplicationController :visibility => visibility, :inserted => false, :user => current_user, - :timestamp => Time.now.getutc, + :timestamp => Time.now.utc, :file => file )