From 639a0b1985d2a9b22ec78ca9b61a09edaf30d655 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 18 Jul 2016 09:04:36 +0100
Subject: [PATCH] Fixed milestone dropdown label not persisting
---
app/helpers/milestones_helper.rb | 8 ++++++--
app/views/shared/issuable/_milestone_dropdown.html.haml | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 05caf91240f..bc87ac32e3e 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -55,10 +55,14 @@ module MilestonesHelper
end
end
- def milestone_dropdown_selected_text
+ def milestone_dropdown_selected_text(selected)
project = @target_project || @project || @projects
- Milestone.of_projects(project).where(title: params[:milestone_title]).first().try(:name)
+ if selected.is_a? Integer
+ Milestone.of_projects(project).where(id: selected).first.try(:title)
+ else
+ Milestone.of_projects(project).where(title: selected).first.try(:title)
+ end
end
def milestone_remaining_days(milestone)
diff --git a/app/views/shared/issuable/_milestone_dropdown.html.haml b/app/views/shared/issuable/_milestone_dropdown.html.haml
index 0b8fd3daad7..575c71af6dc 100644
--- a/app/views/shared/issuable/_milestone_dropdown.html.haml
+++ b/app/views/shared/issuable/_milestone_dropdown.html.haml
@@ -1,6 +1,6 @@
- project = @target_project || @project || @projects
- extra_class = extra_class || ''
-- selected_text = milestone_dropdown_selected_text
+- selected_text = milestone_dropdown_selected_text(selected)
- if selected.present?
= hidden_field_tag(name, selected)
= dropdown_tag(milestone_dropdown_label(selected_text), options: { title: "Filter by milestone", toggle_class: "js-milestone-select js-filter-submit #{extra_class}", filter: true, dropdown_class: "dropdown-menu-selectable",
--
GitLab