From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 Dec 2016 09:02:07 +0000 (+0000)
Subject: Merged r16056 (#14817).
X-Git-Tag: 3.3.2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ac456fafc8c0f4f3fb28ca6ea23301ba3da88da7;p=redmine.git

Merged r16056 (#14817).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16097 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index acb106d3b..908e7ebac 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -208,7 +208,7 @@ class TimelogController < ApplicationController
         else
           flash[:error] = l(:notice_unable_delete_time_entry)
         end
-        redirect_back_or_default project_time_entries_path(@projects.first)
+        redirect_back_or_default project_time_entries_path(@projects.first), :referer => true
       }
       format.api  {
         if destroyed
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index c3e96793d..bb8d2ba7b 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -579,6 +579,15 @@ class TimelogControllerTest < ActionController::TestCase
     assert_not_nil TimeEntry.find_by_id(1)
   end
 
+  def test_destroy_should_redirect_to_referer
+    referer = 'http://test.host/time_entries?utf8=✓&set_filter=1&&f%5B%5D=user_id&op%5Buser_id%5D=%3D&v%5Buser_id%5D%5B%5D=me'
+    @request.env["HTTP_REFERER"] = referer
+    @request.session[:user_id] = 2
+
+    delete :destroy, :params => {:id => 1}
+    assert_redirected_to referer
+  end
+
   def test_index_all_projects
     get :index
     assert_response :success