##// END OF EJS Templates
Merged r16056 (#14817)....
Jean-Philippe Lang -
r15716:e2b3fcabded6
parent child
Show More
@@ -208,7 +208,7 class TimelogController < ApplicationController
208 else
208 else
209 flash[:error] = l(:notice_unable_delete_time_entry)
209 flash[:error] = l(:notice_unable_delete_time_entry)
210 end
210 end
211 redirect_back_or_default project_time_entries_path(@projects.first)
211 redirect_back_or_default project_time_entries_path(@projects.first), :referer => true
212 }
212 }
213 format.api {
213 format.api {
214 if destroyed
214 if destroyed
@@ -579,6 +579,15 class TimelogControllerTest < ActionController::TestCase
579 assert_not_nil TimeEntry.find_by_id(1)
579 assert_not_nil TimeEntry.find_by_id(1)
580 end
580 end
581
581
582 def test_destroy_should_redirect_to_referer
583 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'
584 @request.env["HTTP_REFERER"] = referer
585 @request.session[:user_id] = 2
586
587 delete :destroy, :params => {:id => 1}
588 assert_redirected_to referer
589 end
590
582 def test_index_all_projects
591 def test_index_all_projects
583 get :index
592 get :index
584 assert_response :success
593 assert_response :success
General Comments 0
You need to be logged in to leave comments. Login now