From 213821458e2eeb236fea0838ca93011c646226b9 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Tue, 22 Nov 2016 15:37:06 +0000
Subject: Loop all projects for the issuesfinder correctly

---
 app/helpers/groups_helper.rb      | 4 +++-
 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
-- 
cgit v1.2.3