diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2019-01-17 15:35:23 +0100 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2019-01-24 18:44:09 +0100 |
| commit | 22eb2e4c227b060981bb37708222cdd07e825542 (patch) | |
| tree | c02c037a5877e1f7075a99806336fef8cb3b03bc /app/models/dashboard_group_milestone.rb | |
| parent | e520a946410ca0007a2a562f2c2a7c6f8c6f1dab (diff) | |
| download | gitlab-ce-22eb2e4c227b060981bb37708222cdd07e825542.tar.gz | |
Adds milestone search
Adds to search ILIKE search for milestones title in:
- Milestones dashboard
- Group milestones page
- Project milestones page
Diffstat (limited to 'app/models/dashboard_group_milestone.rb')
| -rw-r--r-- | app/models/dashboard_group_milestone.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/dashboard_group_milestone.rb b/app/models/dashboard_group_milestone.rb index 9bcc95e35a5..74aa04ab7d0 100644 --- a/app/models/dashboard_group_milestone.rb +++ b/app/models/dashboard_group_milestone.rb @@ -11,11 +11,12 @@ class DashboardGroupMilestone < GlobalMilestone @group_name = milestone.group.full_name end - def self.build_collection(groups) - Milestone.of_groups(groups.select(:id)) + def self.build_collection(groups, params) + milestones = Milestone.of_groups(groups.select(:id)) .reorder_by_due_date_asc .order_by_name_asc .active - .map { |m| new(m) } + milestones = milestones.search_title(params[:search_title]) if params[:search_title].present? + milestones.map { |m| new(m) } end end |