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
extract helper method to expand CSV filter values
Klaus Zanderse10883d6e29f
diff --git a/modules/reporting/lib/widget/filters.rb b/modules/reporting/lib/widget/filters.rbindex c10544f7e9c..9acaed19118 100644--- a/modules/reporting/lib/widget/filters.rb+++ b/modules/reporting/lib/widget/filters.rb@@ -136,5 +136,4 @@ class Widget::Filters < Widget::Base])endend-# rubocop:enable Metrics/AbcSizediff --git a/modules/reporting/lib/widget/filters/base.rb b/modules/reporting/lib/widget/filters/base.rbindex 0c98b23ee99..1786660f5fb 100644--- a/modules/reporting/lib/widget/filters/base.rb+++ b/modules/reporting/lib/widget/filters/base.rb@@ -39,4 +39,11 @@ class Widget::Filters::Base < Widget::Baseend@engine = filter.engineend++ def expand_comma_separated_values!+ # 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(",").map(&:strip)+ end+ endenddiff --git a/modules/reporting/lib/widget/filters/project.rb b/modules/reporting/lib/widget/filters/project.rbindex faa55ba2fff..ac68287b118 100644--- a/modules/reporting/lib/widget/filters/project.rb+++ b/modules/reporting/lib/widget/filters/project.rb@@ -60,11 +60,8 @@ class Widget::Filters::Project < Widget::Filters::Baseclass: "sr-only"end- 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+ def map_filter_values+ expand_comma_separated_values!projects = Project.visible.where(id: filter.values)projects.map { |project| { id: project.id, name: project.name } }diff --git a/modules/reporting/lib/widget/filters/user.rb b/modules/reporting/lib/widget/filters/user.rbindex 7b8793c9e56..73101ddc4c7 100644--- a/modules/reporting/lib/widget/filters/user.rb+++ b/modules/reporting/lib/widget/filters/user.rb@@ -70,11 +70,8 @@ class Widget::Filters::User < Widget::Filters::Baseclass: "sr-only"end- 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+ def map_filter_values+ expand_comma_separated_values!users = User.visible.where(id: filter.values).index_by(&:id)diff --git a/modules/reporting/lib/widget/filters/work_package.rb b/modules/reporting/lib/widget/filters/work_package.rbindex ef57c50898d..7e5b2e37aed 100644--- a/modules/reporting/lib/widget/filters/work_package.rb+++ b/modules/reporting/lib/widget/filters/work_package.rb@@ -66,11 +66,8 @@ class Widget::Filters::WorkPackage < Widget::Filters::Baseclass: "sr-only"end- 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+ def map_filter_values+ expand_comma_separated_values!work_packages = WorkPackage.visible.where(id: filter.values)work_packages.map { |wp| { id: wp.id, name: wp.subject } }