Merge remote-tracking branch 'upstream/pull/4559'

[rails.git] / app / controllers / traces / icons_controller.rb

diff --git a/app/controllers/traces/icons_controller.rb b/app/controllers/traces/icons_controller.rb
index a581796548422f10464c1737741d5441d04c1108..ec67a6bb1336585735388d96709d69653c248b77 100644 (file)
--- a/app/controllers/traces/icons_controller.rb
+++ b/app/controllers/traces/icons_controller.rb
@@ -6,9 +6,9 @@ module Traces
     authorize_resource :trace
 
     def show
     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")
         if trace.public? || (current_user && current_user == trace.user)
           if trace.icon.attached?
             redirect_to rails_blob_path(trace.icon, :disposition => "inline")