diff options
| author | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-10-27 20:24:30 +0300 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-11-13 10:27:42 +0300 |
| commit | 2da77592717cea469785381b15c53b1eafdc2afa (patch) | |
| tree | 924ce176b9e17f6e866f4960785c59bc1b8d9d8b /app/views | |
| parent | 123970182274ead330cdb93a1cb3296884b1cd69 (diff) | |
Apply new search bar on issues and merge request dashboards
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 2 | ||||
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 832ba877558..ca1ad2cd691 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -16,7 +16,7 @@ .nav-controls = render 'shared/issuable/feed_buttons' -= render 'shared/issuable/filter', type: :issues += render 'shared/issuable/search_bar', type: :issues - if current_user && @no_filters_set = render 'shared/dashboard/no_filter_selected' diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index fba8d1cf667..25c2dd6308e 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -12,7 +12,7 @@ .top-area = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set -= render 'shared/issuable/filter', type: :merge_requests += render 'shared/issuable/search_bar', type: :merge_requests - if current_user && @no_filters_set = render 'shared/dashboard/no_filter_selected' diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 95f32bd0180..bab09838489 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -1,7 +1,7 @@ - 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 +- full_path = if @project.present? then @project.full_path elsif @group.present? then @group.full_path else request.path end - user_can_admin_list = board && can?(current_user, :admin_list, board.parent) - show_sorting_dropdown = local_assigns.fetch(:show_sorting_dropdown, true) |