From 6862480632e48c803c52bc701e951356be4c3453 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 25 Mar 2016 17:16:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B2=A1=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 682297a5c..6096b84cd 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -229,7 +229,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.created_at FROM
 	(SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ")

From 16831e19d91f37846eb7454ae803dcd3c0276c81 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 25 Mar 2016 17:34:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?merge=20=E6=99=93=E5=A9=B7=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 26090d104..dea8be552 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -79,6 +79,8 @@
                         <% cache (act) do %>
                             <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => act.id} %>
                         <%end%>
+                        <% when 'JournalsForMessage'%>
+                        <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
                         <% end %>
                     <% when 'Project' %>
                         <% case user_activity.act_type.to_s %>