From 0a001b4f768a3b026d2fabdcbdf25948f8d9a3db Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 11 Jul 2016 11:29:15 +0800
Subject: [PATCH]  message 500 for boliang

---
 app/views/users/_join_course_course_message.html.erb | 2 +-
 app/views/users/_user_message_course.html.erb        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb
index 01ebb5cf9..c7d1157f9 100644
--- a/app/views/users/_join_course_course_message.html.erb
+++ b/app/views/users/_join_course_course_message.html.erb
@@ -18,7 +18,7 @@
   <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
   <p>申请课程：<%= Course.find(ma.course_id).name%></p>
   <div class="fl">课程描述：</div>
-  <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+  <div class="ml60"><%= Course.find(ma.course_id).description %></div>
   <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
 </div>
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index f48ce7010..5702d61d1 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -569,7 +569,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "JoinCourseRequest" %>
+    <% if ma.course_message_type == "JoinCourseRequest" && !ma.nil? %>
         <ul class="homepageNewsList fl" id="course_message_join_<%=ma.id %>">
           <%= render :partial => 'join_course_course_message', :locals => {:ma => ma} %>
         </ul>