diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-14 17:08:33 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-14 17:08:33 +0000 |
| commit | 0046ffc0248f5edda84f8da0c7aeff97733eae2f (patch) | |
| tree | 66c1e4a4d0775d7f05a5b2effb199d1767807788 /app/views/shared/issuable/_search_bar.html.haml | |
| parent | e52529e25c8f4b597bbf4ae2815f570b4e4a9898 (diff) | |
| parent | c7cecae616702a46430ed41e283912ddc22f2612 (diff) | |
| download | gitlab-ce-0046ffc0248f5edda84f8da0c7aeff97733eae2f.tar.gz | |
Merge branch 'issue-boards-new-search-bar' into 'master'
Added filtered search bar to issue boards
Closes #28312
See merge request !9757
Diffstat (limited to 'app/views/shared/issuable/_search_bar.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index f8123846596..f1730b1791c 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -85,8 +85,20 @@ %span.dropdown-label-box{ style: 'background: {{color}}' } %span.label-title.js-data-value {{title}} - .pull-right.filter-dropdown-container - = render 'shared/sort_dropdown' + .filter-dropdown-container + - if type == :boards + - if can?(current_user, :admin_list, @project) + .dropdown.prepend-left-10#js-add-list + %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 + #js-add-issues-btn.prepend-left-10 + - else + = render 'shared/sort_dropdown' - if @bulk_edit .issues_bulk_update.hide |