From 829399b8af4602f74ecba2a9148758cc7e54ca4b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Apr 2016 16:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E5=92=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 6ce4d0423..2a6df9c86 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -209,7 +209,7 @@
               <% end%>
           <% end%>
         </div>
-        <% if @user.courses.visible.count > 0
+        <%# if @user.courses.visible.count > 0
            course_order_ids = "(" +
             CourseActivity.find_by_sql("SELECT  c.course_id, updated_at FROM
 	(SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ")
@@ -221,7 +221,11 @@
 
         end
         %>
-        <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
+        <% if @user.courses.visible.count > 0
+          courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)
+        else
+          courses = []
+        end %>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
           <ul>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
@@ -234,7 +238,7 @@
               <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%>
           <% end%>
         </div>
-        <% if @user.projects.visible.count > 0
+        <%# if @user.projects.visible.count > 0
            project_order_ids = "(" +
             ForgeActivity.find_by_sql("SELECT  p.project_id, p.updated_at FROM
 	(SELECT fa.project_id, MAX(fa.updated_at) AS updated_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ")
@@ -246,7 +250,12 @@
            end
         %>
 
-        <%# 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)%>
+        <% if @user.projects.visible.count > 0
+             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)
+           else
+             projects = []
+           end
+        %>
         <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" id="homepageLeftMenuForge">
           <ul>
             <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>