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

Use "visible" scope when finding traces

Browse source 
Allows to eliminate some :not_found branches.
This commit is contained in:
Anton Khorev 2024-03-27 11:20:19 +03:00
parent 99bed16f9a
commit a969e08641
3 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,9 +6,9 @@ module Traces
authorize_resource :trace
def show
trace = Trace.find(params[:trace_id])
trace = Trace.visible.find(params[:trace_id])
if trace.visible? && trace.inserted?
if trace.inserted?
if trace.public? || (current_user && current_user == trace.user)
if trace.icon.attached?
redirect_to rails_blob_path(trace.icon, :disposition => "inline")

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

@ -6,9 +6,9 @@ module Traces
authorize_resource :trace
def show
trace = Trace.find(params[:trace_id])
trace = Trace.visible.find(params[:trace_id])
if trace.visible? && trace.inserted?
if trace.inserted?
if trace.public? || (current_user && current_user == trace.user)
if trace.icon.attached?
redirect_to rails_blob_path(trace.image, :disposition => "inline")