| @@ -365,6 +365,21 class ApplicationController < ActionController::Base | |||||
| 365 | flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present? |
|
365 | flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present? | |
| 366 | end |
|
366 | end | |
| 367 |
|
367 | |||
|
|
368 | # Sets the `flash` notice or error based the number of issues that did not save | |||
|
|
369 | # | |||
|
|
370 | # @param [Array, Issue] issues all of the saved and unsaved Issues | |||
|
|
371 | # @param [Array, Integer] unsaved_issue_ids the issue ids that were not saved | |||
|
|
372 | def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids) | |||
|
|
373 | if unsaved_issue_ids.empty? | |||
|
|
374 | flash[:notice] = l(:notice_successful_update) unless issues.empty? | |||
|
|
375 | else | |||
|
|
376 | flash[:error] = l(:notice_failed_to_save_issues, | |||
|
|
377 | :count => unsaved_issue_ids.size, | |||
|
|
378 | :total => issues.size, | |||
|
|
379 | :ids => '#' + unsaved_issue_ids.join(', #')) | |||
|
|
380 | end | |||
|
|
381 | end | |||
|
|
382 | ||||
| 368 | # Rescues an invalid query statement. Just in case... |
|
383 | # Rescues an invalid query statement. Just in case... | |
| 369 | def query_statement_invalid(exception) |
|
384 | def query_statement_invalid(exception) | |
| 370 | logger.error "Query::StatementInvalid: #{exception.message}" if logger |
|
385 | logger.error "Query::StatementInvalid: #{exception.message}" if logger | |
| @@ -52,18 +52,6 class IssueMovesController < ApplicationController | |||||
| 52 | @available_statuses = Workflow.available_statuses(@project) |
|
52 | @available_statuses = Workflow.available_statuses(@project) | |
| 53 | end |
|
53 | end | |
| 54 |
|
54 | |||
| 55 | # TODO: duplicated in IssuesController |
|
|||
| 56 | def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids) |
|
|||
| 57 | if unsaved_issue_ids.empty? |
|
|||
| 58 | flash[:notice] = l(:notice_successful_update) unless issues.empty? |
|
|||
| 59 | else |
|
|||
| 60 | flash[:error] = l(:notice_failed_to_save_issues, |
|
|||
| 61 | :count => unsaved_issue_ids.size, |
|
|||
| 62 | :total => issues.size, |
|
|||
| 63 | :ids => '#' + unsaved_issue_ids.join(', #')) |
|
|||
| 64 | end |
|
|||
| 65 | end |
|
|||
| 66 |
|
||||
| 67 | def extract_changed_attributes_for_move(params) |
|
55 | def extract_changed_attributes_for_move(params) | |
| 68 | changed_attributes = {} |
|
56 | changed_attributes = {} | |
| 69 | [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute| |
|
57 | [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute| | |
| @@ -408,17 +408,6 private | |||||
| 408 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true) |
|
408 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true) | |
| 409 | end |
|
409 | end | |
| 410 |
|
410 | |||
| 411 | def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids) |
|
|||
| 412 | if unsaved_issue_ids.empty? |
|
|||
| 413 | flash[:notice] = l(:notice_successful_update) unless issues.empty? |
|
|||
| 414 | else |
|
|||
| 415 | flash[:error] = l(:notice_failed_to_save_issues, |
|
|||
| 416 | :count => unsaved_issue_ids.size, |
|
|||
| 417 | :total => issues.size, |
|
|||
| 418 | :ids => '#' + unsaved_issue_ids.join(', #')) |
|
|||
| 419 | end |
|
|||
| 420 | end |
|
|||
| 421 |
|
||||
| 422 | def check_for_default_issue_status |
|
411 | def check_for_default_issue_status | |
| 423 | if IssueStatus.default.nil? |
|
412 | if IssueStatus.default.nil? | |
| 424 | render_error l(:error_no_default_issue_status) |
|
413 | render_error l(:error_no_default_issue_status) | |
General Comments 0
You need to be logged in to leave comments.
Login now