jro_apps/redmine Commit - r13583:3bd2b43a2f73

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

Jean-Philippe Lang -

r13583:3bd2b43a2f73

parent child

Context file:

r13583:3bd2b43a2f73

app/models/mailer.rb +5 -2

                  days = options[:days] || 7
                  project = options[:project] ? Project.find(options[:project]) : 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]
                  scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" +
                  )
                  scope = scope.where(:assigned_to_id => user_ids) if user_ids.present?
                  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
                  issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker).
                                            group_by(&:assigned_to)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages