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

[rails.git] / app / controllers / traces_controller.rb

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index f717d6943464dfcbc02bdcab2bd9efb79a3e4927..d723bac5b73b634f62d32e99ae6337f8e41c3916 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -65,13 +65,14 @@ class TracesController < ApplicationController
 
     # final helper vars for view
     @target_user = target_user
 
     # final helper vars for view
     @target_user = target_user

+
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   def show
   end
 
   def show

-    @trace = Trace.find(params[:id])
+    @trace = Trace.visible.find(params[:id])

 
 

-    if @trace&.visible? &&
-       (@trace&.public? || @trace&.user == current_user)
+    if @trace.public? || @trace.user == current_user

       @title = t ".title", :name => @trace.name
     else
       flash[:error] = t ".trace_not_found"
       @title = t ".title", :name => @trace.name
     else
       flash[:error] = t ".trace_not_found"


@@ -88,11 +89,9 @@ class TracesController < ApplicationController
   end
 
   def edit
   end
 
   def edit

-    @trace = Trace.find(params[:id])
+    @trace = Trace.visible.find(params[:id])

 
 

-    if !@trace.visible?
-      head :not_found
-    elsif current_user.nil? || @trace.user != current_user
+    if current_user.nil? || @trace.user != current_user

       head :forbidden
     else
       @title = t ".title", :name => @trace.name
       head :forbidden
     else
       @title = t ".title", :name => @trace.name


@@ -136,17 +135,15 @@ class TracesController < ApplicationController
   end
 
   def update
   end
 
   def update

-    @trace = Trace.find(params[:id])
+    @trace = Trace.visible.find(params[:id])

 
 

-    if !@trace.visible?
-      head :not_found
-    elsif current_user.nil? || @trace.user != current_user
+    if current_user.nil? || @trace.user != current_user

       head :forbidden
     elsif @trace.update(trace_params)
       flash[:notice] = t ".updated"
       redirect_to :action => "show", :display_name => current_user.display_name
     else
       head :forbidden
     elsif @trace.update(trace_params)
       flash[:notice] = t ".updated"
       redirect_to :action => "show", :display_name => current_user.display_name
     else

-      @title = t ".title", :name => @trace.name
+      @title = t "traces.edit.title", :name => @trace.name

       render :action => "edit"
     end
   rescue ActiveRecord::RecordNotFound
       render :action => "edit"
     end
   rescue ActiveRecord::RecordNotFound


@@ -154,11 +151,9 @@ class TracesController < ApplicationController
   end
 
   def destroy
   end
 
   def destroy

-    trace = Trace.find(params[:id])
+    trace = Trace.visible.find(params[:id])

 
 

-    if !trace.visible?
-      head :not_found
-    elsif current_user.nil? || (trace.user != current_user && !current_user.administrator? && !current_user.moderator?)
+    if current_user.nil? || (trace.user != current_user && !current_user.administrator? && !current_user.moderator?)

       head :forbidden
     else
       trace.visible = false
       head :forbidden
     else
       trace.visible = false


@@ -176,9 +171,9 @@ class TracesController < ApplicationController
   end
 
   def data
   end
 
   def data

-    trace = Trace.find(params[:id])
+    trace = Trace.visible.find(params[:id])

 
 

-    if trace.visible? && (trace.public? || (current_user && current_user == trace.user))
+    if trace.public? || (current_user && current_user == trace.user)

       if Acl.no_trace_download(request.remote_ip)
         head :forbidden
       elsif request.format == Mime[:xml]
       if Acl.no_trace_download(request.remote_ip)
         head :forbidden
       elsif request.format == Mime[:xml]