From 4c68da9beeeb233fdfcfc5c8227ee5cf9ab4b55b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 13:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=93=BE=E6=8E=A5=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_apply_resource_course_message.html.erb       | 4 ++--
 app/views/users/_apply_resource_course_message_reply.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 55dcb4d22..4dbec8127 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -9,8 +9,8 @@
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>
+  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
   </a>
 </li>
 
diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb
index 4869c4393..7cf246c53 100644
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -11,9 +11,9 @@
   </li>
   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
     <% link_str = ma.apply_result == 1 ?
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请已通过'
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
     :
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请被婉拒' %>
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
     <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
   </a>
   </li>