From 0d049bbe1f0bf885697e3444748507b68fb224fc Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 24 Mar 2016 10:07:39 +0800 Subject: [PATCH] refactor new_base_user --- app/views/layouts/new_base_user.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index c288b9402..a613d8984 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -229,7 +229,7 @@ GROUP BY fa.project_id) AS p ORDER BY p.created_at DESC limit 5").map {|p| p.project_id}.join(",") + ")"%> <%# project_order_ids = "(" + ForgeActivity.select("DISTINCT project_id, max(created_at) as max_created_at").where("project_id in #{"(" + @user.projects.visible.select("projects.id").map{|p| p.id}.join(",") + ")"}").order("max_created_at desc").map {|p| p.project_id}.join(",") + ")"%> - <% projects = Project.joins(:repositories).where("projects.id in #{project_order_ids} and repositories.type='Repository::Gitlab'")%> + <% projects = Project.where("projects.id in #{project_order_ids}")%> <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>