diff options
| author | Phil Hughes <me@iamphill.com> | 2017-03-07 09:24:01 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-03-08 08:48:59 +0000 |
| commit | 850f19c02c53648b16a531a81586c05edcfa7530 (patch) | |
| tree | 7e9ecd27abc82ef1f15ef859402204fde0caf4a0 /app/views/shared/issuable/_filter.html.haml | |
| parent | bd1d778168513e3889df877911589a371277e076 (diff) | |
| download | gitlab-ce-850f19c02c53648b16a531a81586c05edcfa7530.tar.gz | |
Added filtered search bar to issue boards
Closes #28312
Diffstat (limited to 'app/views/shared/issuable/_filter.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index f17ae9f28eb..f0bad69a989 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -1,4 +1,4 @@ -- finder = controller.controller_name == 'issues' || controller.controller_name == 'boards' ? issues_finder : merge_requests_finder +- finder = controller.controller_name == 'issues' ? issues_finder : merge_requests_finder - boards_page = controller.controller_name == 'boards' .issues-filters @@ -34,21 +34,7 @@ %a{ href: page_filter_path(without: issuable_filter_params) } Reset filters .pull-right - - if boards_page - #js-boards-search.issue-boards-search - %input.pull-left.form-control{ type: "search", placeholder: "Filter by name...", "v-model" => "filters.search", "debounce" => "250" } - - if can?(current_user, :admin_list, @project) - #js-add-issues-btn.pull-right.prepend-left-10 - .dropdown.pull-right - %button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path, namespace_path: @project.try(:namespace).try(:path), project_path: @project.try(:path) } } - Add list - .dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new.dropdown-menu-selectable - = render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Add list" } - - if can?(current_user, :admin_label, @project) - = render partial: "shared/issuable/label_page_create" - = dropdown_loading - - else - = render 'shared/sort_dropdown' + = render 'shared/sort_dropdown' - if @bulk_edit .issues_bulk_update.hide |