Fixed milestone dropdown tests
This commit is contained in:
parent
02ce5fba8d
commit
eb49e28ca0
2 changed files with 9 additions and 3 deletions
|
@ -55,6 +55,12 @@ module MilestonesHelper
|
|||
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)
|
||||
if milestone.expired?
|
||||
content_tag(:strong, 'Past due')
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
- project = @target_project || @project
|
||||
- project = @target_project || @project || @projects
|
||||
- extra_class = extra_class || ''
|
||||
- selected_text = project.milestones.find_by_id(selected).try(:name)
|
||||
- selected_text = milestone_dropdown_selected_text
|
||||
- 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",
|
||||
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
|
||||
- if can? current_user, :admin_milestone, project
|
||||
%li
|
||||
|
|
Loading…
Reference in a new issue