From 44b148b32f55c7eabb07de2f11eeda5173b596c6 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 12 Oct 2015 16:15:27 +0800
Subject: [PATCH] =?UTF-8?q?act=E6=9C=89=E5=8F=AF=E8=83=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=AF=BC=E8=87=B4500=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_activity.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index e2e1dcfc2..44b72868d 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -94,7 +94,7 @@
                 $('#reply_content_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
             });
         </script>
-            <% if activity %>
+            <% if activity && activity.course_act%>
                 <% act = activity.course_act %>
                 <% case activity.course_act_type.to_s %>
                 <% when 'HomeworkCommon' %>