OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Optimize to not load stuff for widgets in a loop
Klaus Zandersc0566dcfd0b7
diff --git a/modules/reporting/lib/widget/filters/project.rb b/modules/reporting/lib/widget/filters/project.rbindex 72c957fc6f2..faa55ba2fff 100644--- a/modules/reporting/lib/widget/filters/project.rb+++ b/modules/reporting/lib/widget/filters/project.rb@@ -60,23 +60,13 @@ class Widget::Filters::Project < Widget::Filters::Baseclass: "sr-only"end- def map_filter_values+ def map_filter_values # rubocop:disable Metrics/AbcSize# In case the filter values are all written in a single string (e.g. ["12, 33"])if filter.values.length === 1 && filter.values[0].instance_of?(String)filter.values = filter.values[0].split(",")end- filter.values.each.map do |id|- # When live testing, these IDs came out as integers.- # However, when running the specs, they came out as strings.-- project = Project.visible.find_by(id: id)-- if project.nil?- nil- else- { id: id, name: project.name }- end- end+ projects = Project.visible.where(id: filter.values)+ projects.map { |project| { id: project.id, name: project.name } }endenddiff --git a/modules/reporting/lib/widget/filters/user.rb b/modules/reporting/lib/widget/filters/user.rbindex 420235846a9..f760d9fbb6a 100644--- a/modules/reporting/lib/widget/filters/user.rb+++ b/modules/reporting/lib/widget/filters/user.rb@@ -76,11 +76,13 @@ class Widget::Filters::User < Widget::Filters::Basefilter.values = filter.values[0].split(",")end+ users = User.visible.where(id: filter.values).index_by(&:id)+filter.values.map do |id|if id == CostQuery::Filter::UserId.me_value{ id: CostQuery::Filter::UserId.me_value, name: I18n.t(:label_me) }else- user = User.visible.find_by(id: id)+ user = users[id.to_i]if user.nil?nildiff --git a/modules/reporting/lib/widget/filters/work_package.rb b/modules/reporting/lib/widget/filters/work_package.rbindex 28b14b1c34a..ef57c50898d 100644--- a/modules/reporting/lib/widget/filters/work_package.rb+++ b/modules/reporting/lib/widget/filters/work_package.rb@@ -72,14 +72,7 @@ class Widget::Filters::WorkPackage < Widget::Filters::Basefilter.values = filter.values[0].split(",")end- filter.values.each.map do |id|- work_package = WorkPackage.visible.find_by(id: id)-- if work_package.nil?- nil- else- { id: id, name: work_package.subject }- end- end+ work_packages = WorkPackage.visible.where(id: filter.values)+ work_packages.map { |wp| { id: wp.id, name: wp.subject } }endend