cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use imported scope to simplify trace controller methods

Browse source
This commit is contained in:
Tom Hughes 2024-03-28 17:26:04 +00:00
parent 50df5eefcc
commit 91143a5959
3 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/traces/icons_controller.rb
View file

@ -6,21 +6,17 @@ module Traces
authorize_resource :trace authorize_resource :trace
def show def show
trace = Trace.visible.find(params[:trace_id]) trace = Trace.visible.imported.find(params[:trace_id])
if trace.inserted? if trace.public? || (current_user && current_user == trace.user)
if trace.public? || (current_user && current_user == trace.user) if trace.icon.attached?
if trace.icon.attached? redirect_to rails_blob_path(trace.icon, :disposition => "inline")
redirect_to rails_blob_path(trace.icon, :disposition => "inline")
else
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")
end
else else
head :forbidden 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")
end end
else else
head :not_found head :forbidden
end end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
head :not_found head :not_found

18
app/controllers/traces/pictures_controller.rb
View file

@ -6,21 +6,17 @@ module Traces
authorize_resource :trace authorize_resource :trace
def show def show
trace = Trace.visible.find(params[:trace_id]) trace = Trace.visible.imported.find(params[:trace_id])
if trace.inserted? if trace.public? || (current_user && current_user == trace.user)
if trace.public? || (current_user && current_user == trace.user) if trace.icon.attached?
if trace.icon.attached? redirect_to rails_blob_path(trace.image, :disposition => "inline")
redirect_to rails_blob_path(trace.image, :disposition => "inline")
else
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")
end
else else
head :forbidden 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")
end end
else else
head :not_found head :forbidden
end end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
head :not_found head :not_found

1
app/models/trace.rb
View file

@ -38,6 +38,7 @@ class Trace < ApplicationRecord
scope :visible_to, ->(u) { visible.where(:visibility => %w[public identifiable]).or(visible.where(:user => u)) } scope :visible_to, ->(u) { visible.where(:visibility => %w[public identifiable]).or(visible.where(:user => u)) }
scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) } scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) }
scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) } scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
scope :imported, -> { where(:inserted => true) }
has_one_attached :file, :service => Settings.trace_file_storage has_one_attached :file, :service => Settings.trace_file_storage
has_one_attached :image, :service => Settings.trace_image_storage has_one_attached :image, :service => Settings.trace_image_storage