before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data]
around_filter :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
- caches_action :list, :unless => :logged_in?, :layout => false
- caches_action :view, :layout => false
- caches_action :georss, :layout => true
- cache_sweeper :trace_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
- cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
-
# 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
if !display_name.blank?
target_user = User.active.where(:display_name => display_name).first
if target_user.nil?
- @title = t'trace.no_such_user.title'
- @not_found_user = display_name
- render :action => 'no_such_user', :status => :not_found
+ render_unknown_user display_name
return
end
end
end
if params[:tag]
- @tag = params[:tag]
-
- files = Tracetag.where(:tag => params[:tag]).select(:gpx_id).all
-
- if files.length > 0
- @traces = @traces.where(:id => files.collect { |tt| tt.gpx_id })
- end
+ @traces = @traces.tagged(params[:tag])
end
@page = (params[:page] || 1).to_i
logger.info("id is #{@trace.id}")
flash[:notice] = t 'trace.create.trace_uploaded'
- if @user.traces.count(:conditions => { :inserted => false }) > 4
- flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.count(:conditions => { :inserted => false })
+ if @user.traces.where(:inserted => false).count > 4
+ flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.where(:inserted => false).count
end
redirect_to :action => :list, :display_name => @user.display_name
trace = Trace.find(params[:id])
if trace.visible? and (trace.public? or (@user and @user == trace.user))
- if Acl.address(request.remote_ip).where(:k => "no_trace_download").exists?
- render :nothing => true, :status => :forbidden
+ if Acl.no_trace_download(request.remote_ip)
+ render :text => "", :status => :forbidden
elsif request.format == Mime::XML
- send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.to_s, :disposition => 'attachment')
+ send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment')
+ elsif request.format == Mime::GPX
+ send_file(trace.xml_file, :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
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def edit
@trace = Trace.find(params[:id])
- if @user and @trace.user == @user
+ if not @trace.visible?
+ render :text => "", :status => :not_found
+ elsif @user.nil? or @trace.user != @user
+ render :text => "", :status => :forbidden
+ else
@title = t 'trace.edit.title', :name => @trace.name
+
if params[:trace]
@trace.description = params[:trace][:description]
@trace.tagstring = params[:trace][:tagstring]
@trace.visibility = params[:trace][:visibility]
if @trace.save
- redirect_to :action => 'view'
+ redirect_to :action => 'view', :display_name => @user.display_name
end
end
- else
- render :nothing => true, :status => :forbidden
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def delete
trace = Trace.find(params[:id])
- if @user and trace.user == @user
- if request.post? and trace.visible?
- trace.visible = false
- trace.save
- flash[:notice] = t 'trace.delete.scheduled_for_deletion'
- redirect_to :action => :list, :display_name => @user.display_name
- else
- render :nothing => true, :status => :bad_request
- end
+ if not trace.visible?
+ render :text => "", :status => :not_found
+ elsif @user.nil? or trace.user != @user
+ render :text => "", :status => :forbidden
else
- render :nothing => true, :status => :forbidden
+ trace.visible = false
+ trace.save
+ flash[:notice] = t 'trace.delete.scheduled_for_deletion'
+ redirect_to :action => :list, :display_name => @user.display_name
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def georss
- traces = Trace.public
+ @traces = Trace.public.visible
if params[:display_name]
- traces = traces.joins(:user).where(:users => {:display_name => params[:display_name]})
+ @traces = @traces.joins(:user).where(:users => {:display_name => params[:display_name]})
end
if params[:tag]
- traces = traces.where("EXISTS (SELECT * FROM gpx_file_tags AS gft WHERE gft.gpx_id = gpx_files.id AND gft.tag = ?)")
+ @traces = @traces.tagged(params[:tag])
end
- traces = traces.order("timestamp DESC")
- traces = traces.limit(20)
- traces = traces.includes(:user)
-
- rss = OSM::GeoRSS.new
-
- traces.each do |trace|
- rss.add(trace.latitude, trace.longitude, trace.name, trace.user.display_name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), "<img src='#{url_for({:controller => 'trace', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp)
- end
-
- render :text => rss.to_s, :content_type => "application/rss+xml"
+ @traces = @traces.order("timestamp DESC")
+ @traces = @traces.limit(20)
+ @traces = @traces.includes(:user)
end
def picture
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')
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
else
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def icon
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')
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
else
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
end
def api_read
if trace.public? or trace.user == @user
render :text => trace.to_xml.to_s, :content_type => "text/xml"
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
trace.visibility = new_trace.visibility
trace.save!
- render :nothing => true, :status => :ok
+ render :text => "", :status => :ok
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
trace.visible = false
trace.save!
- render :nothing => true, :status => :ok
+ render :text => "", :status => :ok
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
trace = Trace.find(params[:id])
if trace.public? or trace.user == @user
- if request.format == Mime::XML
- send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.to_s, :disposition => 'attachment')
+ if request.format == Mime::XML or request.format == Mime::GPX
+ send_file(trace.xml_file, :filename => "#{trace.id}.xml", :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
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
def api_create
- if request.post?
- tags = params[:tags] || ""
- description = params[:description] || ""
- visibility = params[:visibility]
-
- if visibility.nil?
- if params[:public] && params[:public].to_i.nonzero?
- visibility = "public"
- else
- visibility = "private"
- end
+ tags = params[:tags] || ""
+ description = params[:description] || ""
+ visibility = params[:visibility]
+
+ if visibility.nil?
+ if params[:public] && params[:public].to_i.nonzero?
+ visibility = "public"
+ else
+ visibility = "private"
end
+ end
- if params[:file].respond_to?(:read)
- do_create(params[:file], tags, description, visibility)
+ if params[:file].respond_to?(:read)
+ do_create(params[:file], tags, description, visibility)
- if @trace.id
- render :text => @trace.id.to_s, :content_type => "text/plain"
- elsif @trace.valid?
- render :nothing => true, :status => :internal_server_error
- else
- render :nothing => true, :status => :bad_request
- end
+ if @trace.id
+ render :text => @trace.id.to_s, :content_type => "text/plain"
+ elsif @trace.valid?
+ render :text => "", :status => :internal_server_error
else
- render :nothing => true, :status => :bad_request
+ render :text => "", :status => :bad_request
end
else
- render :nothing => true, :status => :method_not_allowed
+ render :text => "", :status => :bad_request
end
end
filename = "/tmp/#{rand}"
# ...and save the uploaded file to that location
- File.open(filename, "w") { |f| f.write(file.read) }
+ 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
- @trace = Trace.new({
+ @trace = Trace.new(
:name => name,
:tagstring => tags,
:description => description,
:inserted => true,
:user => @user,
:timestamp => Time.now.getutc
- })
+ )
Trace.transaction do
begin
projects / rails.git / blobdiff