diff options
Diffstat (limited to 'app/views/search/_filter.html.haml')
| -rw-r--r-- | app/views/search/_filter.html.haml | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml index bee4aff605f..e7febd4638b 100644 --- a/app/views/search/_filter.html.haml +++ b/app/views/search/_filter.html.haml @@ -2,15 +2,14 @@ = hidden_field_tag :group_id, params[:group_id] - if params[:project_id].present? = hidden_field_tag :project_id, params[:project_id] -.dropdown.form-group.mb-lg-0.mx-lg-1 +.dropdown.form-group.mb-lg-0.mx-lg-1{ data: { testid: "group-filter" } } %label.d-block{ for: "dashboard_search_group" } = _("Group") - %button.dropdown-menu-toggle.js-search-group-dropdown.mt-0{ type: "button", id: "dashboard_search_group", data: { toggle: "dropdown", group_id: params[:group_id] } } - %span.dropdown-toggle-text - - if @group.present? - = @group.name - - else - = _("Any") + %button.dropdown-menu-toggle.gl-display-inline-flex.js-search-group-dropdown.gl-mt-0{ type: "button", id: "dashboard_search_group", data: { toggle: "dropdown", group_id: params[:group_id] } } + %span.dropdown-toggle-text.gl-flex-grow-1.str-truncated-100 + = @group&.name || _("Any") + - if @group.present? + = link_to sprite_icon("clear"), url_for(safe_params.except(:project_id, :group_id)), class: 'search-clear js-search-clear has-tooltip', title: _('Clear') = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-right = dropdown_title(_("Filter results by group")) @@ -21,12 +20,11 @@ .dropdown.project-filter.form-group.mb-lg-0.mx-lg-1 %label.d-block{ for: "dashboard_search_project" } = _("Project") - %button.dropdown-menu-toggle.js-search-project-dropdown.mt-0{ type: "button", id: "dashboard_search_project", data: { toggle: "dropdown"} } - %span.dropdown-toggle-text - - if @project.present? - = @project.full_name - - else - = _("Any") + %button.dropdown-menu-toggle.gl-display-inline-flex.js-search-project-dropdown.gl-mt-0{ type: "button", id: "dashboard_search_project", data: { toggle: "dropdown", target: '.project-filter' } } + %span.dropdown-toggle-text.gl-flex-grow-1.str-truncated-100 + = @project&.full_name || _("Any") + - if @project.present? + = link_to sprite_icon("clear"), url_for(safe_params.except(:project_id)), class: 'search-clear js-search-clear has-tooltip', title: _('Clear') = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-right = dropdown_title(_("Filter results by project")) |