Commit 8563274b authored by Phil Hughes's avatar Phil Hughes

Merge branch '2462-issue-board-modal-missing-weight-filter-in-filtered-search' into 'master'

Resolve "Issue board modal missing weight filter in filtered search"

Closes #2462

See merge request !1960
parents 2580620f f339d780
...@@ -66,7 +66,7 @@ class FilteredSearchDropdownManager { ...@@ -66,7 +66,7 @@ class FilteredSearchDropdownManager {
this.mapping.weight = { this.mapping.weight = {
reference: null, reference: null,
gl: 'DropdownNonUser', gl: 'DropdownNonUser',
element: document.querySelector('#js-dropdown-weight'), element: this.container.querySelector('#js-dropdown-weight'),
}; };
} }
} }
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
%span.label-title.js-data-value %span.label-title.js-data-value
{{title}} {{title}}
- if type == :issues || type == :boards - if type == :issues || type == :boards || type == :boards_modal
#js-dropdown-weight.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'balance-scale', hint: 'weight', tag: 'weight' } } #js-dropdown-weight.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'balance-scale', hint: 'weight', tag: 'weight' } }
%ul{ 'data-dropdown' => true } %ul{ 'data-dropdown' => true }
%li.filter-dropdown-item{ 'data-value' => 'none' } %li.filter-dropdown-item{ 'data-value' => 'none' }
......
...@@ -36,6 +36,14 @@ describe 'Issue Boards add issue modal', :feature, :js do ...@@ -36,6 +36,14 @@ describe 'Issue Boards add issue modal', :feature, :js do
end end
end end
it 'shows weight filter' do
click_button('Add issues')
wait_for_vue_resource
find('.add-issues-search .filtered-search').click
expect(page.find('.filter-dropdown')).to have_content 'weight'
end
context 'modal interaction' do context 'modal interaction' do
it 'opens modal' do it 'opens modal' do
click_button('Add issues') click_button('Add issues')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment