| @@ -236,7 +236,13 class IssuesController < ApplicationController | |||||
| 236 | return unless api_request? |
|
236 | return unless api_request? | |
| 237 | end |
|
237 | end | |
| 238 | end |
|
238 | end | |
| 239 |
@issues.each |
|
239 | @issues.each do |issue| | |
|
|
240 | begin | |||
|
|
241 | issue.reload.destroy | |||
|
|
242 | rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists | |||
|
|
243 | # nothing to do, issue was already deleted (eg. by a parent) | |||
|
|
244 | end | |||
|
|
245 | end | |||
| 240 | respond_to do |format| |
|
246 | respond_to do |format| | |
| 241 | format.html { redirect_back_or_default(:action => 'index', :project_id => @project) } |
|
247 | format.html { redirect_back_or_default(:action => 'index', :project_id => @project) } | |
| 242 | format.api { head :ok } |
|
248 | format.api { head :ok } | |
| @@ -1323,6 +1323,18 class IssuesControllerTest < ActionController::TestCase | |||||
| 1323 | assert !(Issue.find_by_id(1) || Issue.find_by_id(2) || Issue.find_by_id(6)) |
|
1323 | assert !(Issue.find_by_id(1) || Issue.find_by_id(2) || Issue.find_by_id(6)) | |
| 1324 | end |
|
1324 | end | |
| 1325 |
|
1325 | |||
|
|
1326 | def test_destroy_parent_and_child_issues | |||
|
|
1327 | parent = Issue.generate!(:project_id => 1, :tracker_id => 1) | |||
|
|
1328 | child = Issue.generate!(:project_id => 1, :tracker_id => 1, :parent_issue_id => parent.id) | |||
|
|
1329 | assert child.is_descendant_of?(parent.reload) | |||
|
|
1330 | ||||
|
|
1331 | @request.session[:user_id] = 2 | |||
|
|
1332 | assert_difference 'Issue.count', -2 do | |||
|
|
1333 | post :destroy, :ids => [parent.id, child.id], :todo => 'destroy' | |||
|
|
1334 | end | |||
|
|
1335 | assert_response 302 | |||
|
|
1336 | end | |||
|
|
1337 | ||||
| 1326 | def test_default_search_scope |
|
1338 | def test_default_search_scope | |
| 1327 | get :index |
|
1339 | get :index | |
| 1328 | assert_tag :div, :attributes => {:id => 'quick-search'}, |
|
1340 | assert_tag :div, :attributes => {:id => 'quick-search'}, | |
General Comments 0
You need to be logged in to leave comments.
Login now