Skip to content
Snippets Groups Projects
Commit eb49e28c authored by Phil Hughes's avatar Phil Hughes
Browse files

Fixed milestone dropdown tests

parent 02ce5fba
No related branches found
No related tags found
1 merge request!5293Updated issuable form with GL dropdowns
Loading
@@ -55,6 +55,12 @@ module MilestonesHelper
Loading
@@ -55,6 +55,12 @@ module MilestonesHelper
end end
end end
   
def milestone_dropdown_selected_text
project = @target_project || @project || @projects
Milestone.of_projects(project).where(title: params[:milestone_title]).first().try(:name)
end
def milestone_remaining_days(milestone) def milestone_remaining_days(milestone)
if milestone.expired? if milestone.expired?
content_tag(:strong, 'Past due') content_tag(:strong, 'Past due')
Loading
Loading
- project = @target_project || @project - project = @target_project || @project || @projects
- extra_class = extra_class || '' - extra_class = extra_class || ''
- selected_text = project.milestones.find_by_id(selected).try(:name) - selected_text = milestone_dropdown_selected_text
- if selected.present? - if selected.present?
= hidden_field_tag(name, selected) = 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", = 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",
placeholder: "Search milestones", footer_content: project.present?, data: { show_no: true, show_any: show_any, show_upcoming: show_upcoming, field_name: name, selected: selected, project_id: project.try(:id), milestones: milestones_filter_dropdown_path, default_label: "Milestone" } }) do placeholder: "Search milestones", footer_content: project.present?, data: { show_no: true, show_any: show_any, show_upcoming: show_upcoming, field_name: name, selected: selected, project_id: project.try(:id), milestones: milestones_filter_dropdown_path, default_label: "Milestone" } }) do
- if project - if project && project.respond_to?(:namespace)
%ul.dropdown-footer-list %ul.dropdown-footer-list
- if can? current_user, :admin_milestone, project - if can? current_user, :admin_milestone, project
%li %li
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment