diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 05caf91240fa081d079fbbc70a65cbde2420abf7..bc87ac32e3eecfd7928aa0a1d8890bb0486dbbb1 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 0b8fd3daad7cb8f245eabb3833ced53fa30c78ab..575c71af6dc3aa02d3c1d8a23f51a905743e9a68 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",