From 63f44535a321ec99f62fae4015e90cc2362f00bb Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 18 Jul 2015 15:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/activities_helper.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb
index cf8679da6..822613455 100644
--- a/app/helpers/activities_helper.rb
+++ b/app/helpers/activities_helper.rb
@@ -44,6 +44,9 @@ module ActivitiesHelper
   end
 
   def get_container_type(activity)
+    if activity.act.nil?
+      return ['Unknow',0]
+    end
     #问卷
     if activity.act_type == 'Poll'
       return ['Course',activity.act.polls_group_id]