meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-04 16:23:06 +00:00
Code Issues Releases Wiki Activity

Raise an error if version is not found (#18983).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13965 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-02-07 08:12:06 +00:00
parent e94920a5ff
commit 3bd2b43a2f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/mailer.rb
View File

@ -324,7 +324,10 @@ class Mailer < ActionMailer::Base
days = options[:days] || 7 days = options[:days] || 7
project = options[:project] ? Project.find(options[:project]) : nil project = options[:project] ? Project.find(options[:project]) : nil
tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
target_versions = options[:version] ? Version.where(name: options[:version]).select(:id).map(&:id) : nil target_version_id = options[:version] ? Version.named(options[:version]).pluck(:id) : nil
if options[:version] && target_version_id.blank?
raise ActiveRecord::RecordNotFound.new("Couldn't find Version with named #{options[:version]}")
end
user_ids = options[:users] user_ids = options[:users]
scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" + scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" +
@ -333,7 +336,7 @@ class Mailer < ActionMailer::Base
) )
scope = scope.where(:assigned_to_id => user_ids) if user_ids.present? scope = scope.where(:assigned_to_id => user_ids) if user_ids.present?
scope = scope.where(:project_id => project.id) if project scope = scope.where(:project_id => project.id) if project
scope = scope.where(:fixed_version_id => target_versions) unless target_versions.blank? scope = scope.where(:fixed_version_id => target_version_id) if target_version_id.present?
scope = scope.where(:tracker_id => tracker.id) if tracker scope = scope.where(:tracker_id => tracker.id) if tracker
issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker). issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker).
group_by(&:assigned_to) group_by(&:assigned_to)