| @@ -262,13 +262,7 class IssuesController < ApplicationController | |||||
| 262 | unsaved_issue_ids << issue.id |
|
262 | unsaved_issue_ids << issue.id | |
| 263 | end |
|
263 | end | |
| 264 | end |
|
264 | end | |
| 265 | if unsaved_issue_ids.empty? |
|
265 | set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids) | |
| 266 | flash[:notice] = l(:notice_successful_update) unless @issues.empty? |
|
|||
| 267 | else |
|
|||
| 268 | flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size, |
|
|||
| 269 | :total => @issues.size, |
|
|||
| 270 | :ids => '#' + unsaved_issue_ids.join(', #')) |
|
|||
| 271 | end |
|
|||
| 272 | redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project}) |
|
266 | redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project}) | |
| 273 | return |
|
267 | return | |
| 274 | end |
|
268 | end | |
| @@ -309,13 +303,8 class IssuesController < ApplicationController | |||||
| 309 | unsaved_issue_ids << issue.id |
|
303 | unsaved_issue_ids << issue.id | |
| 310 | end |
|
304 | end | |
| 311 | end |
|
305 | end | |
| 312 | if unsaved_issue_ids.empty? |
|
306 | set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids) | |
| 313 | flash[:notice] = l(:notice_successful_update) unless @issues.empty? |
|
307 | ||
| 314 | else |
|
|||
| 315 | flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size, |
|
|||
| 316 | :total => @issues.size, |
|
|||
| 317 | :ids => '#' + unsaved_issue_ids.join(', #')) |
|
|||
| 318 | end |
|
|||
| 319 | if params[:follow] |
|
308 | if params[:follow] | |
| 320 | if @issues.size == 1 && moved_issues.size == 1 |
|
309 | if @issues.size == 1 && moved_issues.size == 1 | |
| 321 | redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first |
|
310 | redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first | |
| @@ -568,4 +557,15 private | |||||
| 568 | end |
|
557 | end | |
| 569 |
|
558 | |||
| 570 | end |
|
559 | end | |
|
|
560 | ||||
|
|
561 | def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids) | |||
|
|
562 | if unsaved_issue_ids.empty? | |||
|
|
563 | flash[:notice] = l(:notice_successful_update) unless issues.empty? | |||
|
|
564 | else | |||
|
|
565 | flash[:error] = l(:notice_failed_to_save_issues, | |||
|
|
566 | :count => unsaved_issue_ids.size, | |||
|
|
567 | :total => issues.size, | |||
|
|
568 | :ids => '#' + unsaved_issue_ids.join(', #')) | |||
|
|
569 | end | |||
|
|
570 | end | |||
| 571 | end |
|
571 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now