jro_apps/redmine Commit - r13583:3bd2b43a2f73

324

days = options[:days] || 7

324

days = options[:days] || 7

325

project = options[:project] ? Project.find(options[:project]) : nil

325

project = options[:project] ? Project.find(options[:project]) : nil

326

tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil

326

tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil

327

target_versions = options[:version] ? Version.~~where~~(~~name~~: options[:version]).~~select~~(~~:id~~).~~map~~(&:id) : nil

327

target_version_id = options[:version] ? Version.named(options[:version]).pluck(:id) : nil

328

if options[:version] && target_version_id.blank?

329

raise ActiveRecord::RecordNotFound.new("Couldn't find Version with named #{options[:version]}")

330

end

328

user_ids = options[:users]

331

user_ids = options[:users]

329

332

330

scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" +

333

scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" +

333

)

336

)

334

scope = scope.where(:assigned_to_id => user_ids) if user_ids.present?

337

scope = scope.where(:assigned_to_id => user_ids) if user_ids.present?

335

scope = scope.where(:project_id => project.id) if project

338

scope = scope.where(:project_id => project.id) if project

336

scope = scope.where(:fixed_version_id => target_versions) ~~unless~~ target_versions.~~blank~~?

339

scope = scope.where(:fixed_version_id => target_version_id) if target_version_id.present?

337

scope = scope.where(:tracker_id => tracker.id) if tracker

340

scope = scope.where(:tracker_id => tracker.id) if tracker

338

issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker).

341

issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker).

339

group_by(&:assigned_to)

342

group_by(&:assigned_to)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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

                 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)