From 482df88d70d3ff1f6fba15f17cc6d8b2fcce2829 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 12 Jun 2015 16:52:49 +0800
Subject: [PATCH] ...

---
 app/views/projects/_history.html.erb          | 3 ++-
 app/views/users/_history.html.erb             | 3 ++-
 app/views/words/_journal_reply_items.html.erb | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index d85906a2c..54dda7b28 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -9,7 +9,8 @@
                   <span><%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10', :target => "_blank" %>
                   </span><span class="c_grey fr"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
-                  <p><%= textilizable journal.notes%></p>
+                  <!--<p><%#= textilizable journal.notes%></p>-->
+                  <p><%=journal.notes.html_safe%>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
diff --git a/app/views/users/_history.html.erb b/app/views/users/_history.html.erb
index 8902b7dfc..d69b6b25b 100644
--- a/app/views/users/_history.html.erb
+++ b/app/views/users/_history.html.erb
@@ -11,7 +11,8 @@
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
-                  <p><%= textilizable journal.notes%></p>
+                  <!--<p><%#= textilizable journal.notes%></p>-->
+                  <p><%=journal.notes.html_safe%></p>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index af8be7197..7c8dd7f64 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -22,7 +22,7 @@
         <% end %>
 
         <p>
-          <%= reply.notes %>
+          <%= reply.notes.html_safe %>
         </p>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>