diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-22 15:37:06 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-22 15:37:06 +0000 |
| commit | 213821458e2eeb236fea0838ca93011c646226b9 (patch) | |
| tree | 46f2d274c3cbe0380e50cb277761849b35744bbf | |
| parent | b1b5060dbad15975184ec20a1914c7c48fc804db (diff) | |
| download | gitlab-ce-fix-issues-empty-state-on-groups.tar.gz | |
Loop all projects for the issuesfinder correctlyfix-issues-empty-state-on-groups
| -rw-r--r-- | app/helpers/groups_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/groups/issues.html.haml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 75cd9eece5c..d5275bfd7b2 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -50,6 +50,8 @@ module GroupsHelper end def group_issues(group) - IssuesFinder.new(current_user, group_id: group.id).execute + group.projects.map do |project| + IssuesFinder.new(current_user, project_id: project.id).execute + end.compact end end diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 324a116a50e..87f86787826 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -3,7 +3,9 @@ - if current_user = auto_discovery_link_tag(:atom, url_for(params.merge(format: :atom, private_token: current_user.private_token)), title: "#{@group.name} issues") -- if group_issues(@group).exists? +- if group_issues(@group).empty? + = render 'shared/empty_states/issues', project_select_button: true +- else .top-area = render 'shared/issuable/nav', type: :issues .nav-controls @@ -25,5 +27,3 @@ .prepend-top-default = render 'shared/issues' -- else - = render 'shared/empty_states/issues', project_select_button: true |