From 1706fffb4be70f1a5aac5929d271040883aad3ec Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 5 Dec 2014 16:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80=E7=9A=84?=
 =?UTF-8?q?=E7=88=B6=E7=BA=A7=E7=95=99=E8=A8=80=E5=88=A0=E9=99=A4=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply_items.html.erb | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 867812f3c..fa69176a8 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -1,49 +1,51 @@
-<% reply_allow = JournalsForMessage.create_by_user? User.current %>
-<% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
-<div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
-	<div class="recall_head">
-      <% if show_name %>
-        <%= image_tag url_to_avatar(reply.user) %>
-      <% else %>
-          <%= image_tag url_to_avatar(nil) %>
-      <% end %>
-	</div>
-	<div class="recall_con">
-		<% id = 'project_respond_form_'+ reply.id.to_s %>
-          <%= link_to reply.user.name, user_path(reply.user) %>
-          回复
-          <% parent_jour = JournalsForMessage.find reply.m_reply_id %>
-          <% if show_name && parent_jour %>
+<% parent_jour = JournalsForMessage.where("id = #{reply.m_reply_id}").first %>
+<% if parent_jour%>
+    <% reply_allow = JournalsForMessage.create_by_user? User.current %>
+    <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
+    <div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
+      <div class="recall_head">
+        <% if show_name %>
+            <%= image_tag url_to_avatar(reply.user) %>
+        <% else %>
+            <%= image_tag url_to_avatar(nil) %>
+        <% end %>
+      </div>
+      <div class="recall_con">
+        <% id = 'project_respond_form_'+ reply.id.to_s %>
+        <%= link_to reply.user.name, user_path(reply.user) %>
+        回复
+        <% if show_name %>
             <%= link_to parent_jour.user.name, user_path(parent_jour.user) %>
-          <% else %>
+        <% else %>
             <%= l(:label_anonymous) %>
-          <% end %>
+        <% end %>
 
         <p>
 		    <span class="message-notes">
               <%= reply.notes %>
             </span>
-	    </p>
-	    <p>
+        </p>
+        <p>
             <span class="time">
               <%= format_time reply.created_on %>
             </span>
             <span class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
-                <% if User.current.admin? || reply.user.id == User.current.id %>
+                <% if User.current.admin? || reply.user.id == User.current.id%>
                   <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
-                             :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
+                              :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
-                <% if reply_allow %>
+              <% if reply_allow %>
                          <%= link_to l(:label_projects_feedback_respond),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </span>
-	    </p>
-	</div>
-	<div id='<%=id%>' class="respond-form">
+        </p>
+      </div>
+      <div id='<%=id%>' class="respond-form">
         <% if reply_allow %>
             <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
         <% end %>
-  </div>
-  <div style="clear: both;"></div>
-</div>
\ No newline at end of file
+      </div>
+      <div style="clear: both;"></div>
+    </div>
+<% end %>
\ No newline at end of file