diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-02-23 12:10:57 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-02-27 10:32:29 +0000 |
| commit | 868cb4307f93b2f8fa0d25d9e47e632d0855881e (patch) | |
| tree | c611b02f7bf745fadbd7eef47486aa9331fceaed /app/views/groups/issues.html.haml | |
| parent | 58a312f5097b30a93100de93d06427402d514b48 (diff) | |
| download | gitlab-ce-868cb4307f93b2f8fa0d25d9e47e632d0855881e.tar.gz | |
Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroups
Previously, these wouldn't count issues or MRs in subgroups - meaning that if
_this_ group had no issues or MRs, we'd show the empty state, which was wrong.
Diffstat (limited to 'app/views/groups/issues.html.haml')
| -rw-r--r-- | app/views/groups/issues.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index f2ae7c52031..ca3f018c5e6 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -1,12 +1,13 @@ - page_title "Issues" -- group_issues_exists = group_issues(@group).exists? = content_for :meta_tags do = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@group.name} issues") - content_for :page_specific_javascripts do = webpack_bundle_tag 'common_vue' -- if group_issues_exists +- if group_issues_count(state: 'all').zero? + = render 'shared/empty_states/issues', project_select_button: true +- else .top-area = render 'shared/issuable/nav', type: :issues .nav-controls @@ -19,5 +20,3 @@ = render 'shared/issuable/search_bar', type: :issues = render 'shared/issues' -- else - = render 'shared/empty_states/issues', project_select_button: true |