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

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

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index a720c5fff438dc1ed4e8d9152e85dacf44ed4cc1..f97e5ecd2f9f64308a066b88fad2e964f3a20a83 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -33,7 +33,7 @@ class TraceController < ApplicationController
     @title = if target_user.nil?
                t "trace.list.public_traces"
              elsif current_user && current_user == target_user
-               t "trace.list.your_traces"
+               t "trace.list.my_traces"
              else
                t "trace.list.public_traces_from", :user => target_user.display_name
              end
@@ -186,13 +186,13 @@ class TraceController < ApplicationController
 
     if !trace.visible?
       head :not_found
-    elsif current_user.nil? || trace.user != current_user
+    elsif current_user.nil? || (trace.user != current_user && !current_user.administrator? && !current_user.moderator?)
       head :forbidden
     else
       trace.visible = false
       trace.save
       flash[:notice] = t "trace.delete.scheduled_for_deletion"
-      redirect_to :action => :list, :display_name => current_user.display_name
+      redirect_to :action => :list, :display_name => trace.user.display_name
     end
   rescue ActiveRecord::RecordNotFound
     head :not_found