From 7b3468718fc990f86a3de378e6ad6bed565fd1cd Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Tue, 12 Aug 2014 10:24:27 +0800 Subject: [PATCH] =?UTF-8?q?#898=20=E5=BC=95=E7=94=A8=E5=9B=9E=E5=B8=96?= =?UTF-8?q?=E4=B8=8D=E8=BD=AC=E4=B9=89=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_project_show.html.erb | 3 ++- app/views/messages/show.html.erb | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index 4456f36e9..66027e6ec 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -161,7 +161,8 @@
- <%= textilizable message, :content, :attachments => message.attachments %> + <%#= textilizable message,:content,:attachments => message.attachments %> + <%= message.content.html_safe %>
<%= link_to_attachments message, :author => false %> diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 6e5888363..5996852ef 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,5 +1,5 @@ -<% if @project %> - <%= render :partial => 'project_show', locals: {project: @project} %> -<% elsif @course %> - <%= render :partial => 'course_show', locals: {course: @course} %> -<% end %> +<% if @project %> + <%= render :partial => 'project_show', locals: {project: @project} %> +<% elsif @course %> + <%= render :partial => 'course_show', locals: {course: @course} %> +<% end %>