diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-06-29 18:51:48 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-05 17:27:30 +0800 |
| commit | 6b43e8e6367062c7c26c8aa2de4a435dd533b09b (patch) | |
| tree | 0b31b65b69cb8200a7cb93d71911316bb967622a | |
| parent | d04ae01a6a53f4296079fa7e15e191d11b539afa (diff) | |
| download | gitlab-ce-6b43e8e6367062c7c26c8aa2de4a435dd533b09b.tar.gz | |
Unify app/views/shared/issuable/_search_bar.html.haml
This brings some EE changes which don't hurt
| -rw-r--r-- | app/models/board.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/app/models/board.rb b/app/models/board.rb index 3cede6fc99a..bb6bb753daf 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -26,4 +26,8 @@ class Board < ActiveRecord::Base def closed_list lists.merge(List.closed).take end + + def scoped? + false + end end diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index ef9ea2194ee..7dd32175d2e 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -1,9 +1,14 @@ - type = local_assigns.fetch(:type) +- board = local_assigns.fetch(:board, nil) - block_css_class = type != :boards_modal ? 'row-content-block second-block' : '' - full_path = @project.present? ? @project.full_path : @group.full_path +- user_can_admin_list = can?(current_user, :admin_list, board.parent) .issues-filters .issues-details-filters.filtered-search-block{ class: block_css_class, "v-pre" => type == :boards_modal } + - if type == :boards && board + #js-multiple-boards-switcher.inline.boards-switcher{ "v-cloak" => true } + = render_if_exists "shared/boards/switcher", board: board = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :search]), method: :get, class: 'filter-form js-filter-form' do - if params[:search].present? = hidden_field_tag :search, params[:search] @@ -99,13 +104,18 @@ %gl-emoji %span.js-data-value.prepend-left-10 {{name}} + + = render_if_exists 'shared/issuable/filter_weight', type: type + %button.clear-search.hidden{ type: 'button' } = icon('times') .filter-dropdown-container - if type == :boards - - if can?(current_user, :admin_list, board.parent) - = render_if_exists 'shared/issuable/board_create_list_dropdown', board: board + .js-board-config{ data: { can_admin_list: user_can_admin_list, has_scope: board.scoped? } } + - if user_can_admin_list + = render 'shared/issuable/board_create_list_dropdown', board: board - if @project #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } } + #js-toggle-focus-btn - elsif type != :boards_modal = render 'shared/sort_dropdown' |