From b716b60c0b66d5e792b85236e69fa6b08212fa98 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Wed, 25 Dec 2013 15:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E5=A4=8D=E6=A1=86?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply.html.erb | 2 +-
 app/views/words/_message.html.erb       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb
index f65c973a0..3acf762db 100644
--- a/app/views/words/_journal_reply.html.erb
+++ b/app/views/words/_journal_reply.html.erb
@@ -8,7 +8,7 @@
 	}
 </style>
 <ul>
-           <% fetch_user_leaveWord_reply.each do |reply|%>
+           <% fetch_user_leaveWord_reply(journal).each do |reply|%>
 			<li style="display: block; padding-bottom: 4px;">
 				<div class="inner-right" style="float: left; height: 100%; ">
 					<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index 857d76f65..31e05cbdb 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -35,10 +35,8 @@
 				<%= textilizable journal.notes%>
 		</span>
 		<span class="font_lighter"> <%= l :label_comment_time %>：&nbsp; <%= format_time journal.created_on %></span>
-				<% if @user == User.current %>
 				<% ids = 'project_respond_form_'+ journal.id.to_s%>
-					<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>
-				<% end %>
+				<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>
 		</span>
 		<div style="clear: both;"></div>
 		<div id=<%= ids %> style="display: none; width: 80%; margin: auto;">