diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-03-23 17:27:15 +0300 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-04-03 21:19:09 +0300 |
commit | c1b71e2fa1e49da82b15ee7f12148a372face09c (patch) | |
tree | c88dbf140e95c5d8f3cd6ea201e058a4cd1a1c0b /app/views/dashboard | |
parent | 59a158955e1ae09420ad05e53782e0dbc512e9c8 (diff) |
Check if at least one filter is set on dashboard
When listing issues and merge requests on dasboard page,
make sure that at least one filter is enabled.
User's id is used in search autocomplete widget instead
of username, which allows presetting user in filter dropdowns.
Related to #43246
Diffstat (limited to 'app/views/dashboard')
-rw-r--r-- | app/views/dashboard/issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 3e85535dae0..24d69b56c20 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -5,7 +5,7 @@ = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{current_user.name} issues") .top-area - = render 'shared/issuable/nav', type: :issues + = render 'shared/issuable/nav', type: :issues, display_count: !@no_filters_set .nav-controls = link_to params.merge(rss_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: 'Subscribe' do = icon('rss') diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 53cd1130299..fb57ec7835c 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -3,7 +3,7 @@ - header_title "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id) .top-area - = render 'shared/issuable/nav', type: :merge_requests + = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set .nav-controls = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request", with_feature_enabled: 'merge_requests', type: :merge_requests |