From b6e13340e56a09dfd4060760df1b744379466645 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 25 Jan 2016 15:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=95=99=E8=A8=80=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb           |  4 ++-
 .../users/_user_journalsformessage.html.erb   | 27 +++++++++++++++++--
 app/views/words/create_reply.js.erb           |  6 +----
 app/views/words/destroy.js.erb                | 12 ++++++---
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index d24427a9d..699a5e8ca 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -73,7 +73,6 @@ class WordsController < ApplicationController
       #   render 'test/index'
       # }
       format.js {
-        @reply_type = params[:reply_type]
         @user_activity_id = params[:user_activity_id]
         @activity = JournalsForMessage.find(parent_id)
         @is_activity = params[:is_activity]
@@ -95,6 +94,9 @@ class WordsController < ApplicationController
         @user = User.find(@journal_destroyed.jour_id)
         @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
         @is_user = true
+        @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+        @is_activity = params[:is_activity].to_i if params[:is_activity]
+        @activity = @journal_destroyed.parent if @journal_destroyed.parent
       elsif @journal_destroyed.jour_type == 'HomeworkCommon'
         @homework = HomeworkCommon.find @journal_destroyed.jour_id
         if params[:user_activity_id]
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index e30fd1824..d7247621a 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -39,6 +39,22 @@
         更新时间：<%= format_time(PrincipalActivity.where("principal_act_type='#{activity.class}' and principal_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
+      <% if activity.user == User.current || User.current.admin?%>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to(l(:label_bid_respond_delete),
+                                {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
+                                :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
+                                :class => "postOptionLink", :title => l(:button_delete))  %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <% end%>
     </div>
     <div class="cl"></div>
   </div>
@@ -71,7 +87,7 @@
           <ul>
             <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
                 <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_delete_<%= comment.id%>').show();" onmouseout="$('#message_delete_<%= comment.id%>').hide();"  style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
                   </div>
@@ -90,6 +106,14 @@
                             <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                           <% end %>
                       </span>
+                      <div id="message_delete_<%=comment.id %>" style="display: none" class="mr10 fr">
+                          <% if comment.user == User.current|| User.current.admin? %>
+                              <%= link_to(l(:label_bid_respond_delete),
+                                          {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
+                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
+                                          :class => "delete", :title => l(:button_delete))  %>
+                          <% end %>
+                      </div>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= user_activity_id %>">
                       <%= comment.notes.html_safe %>
@@ -112,7 +136,6 @@
               <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
               <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
               <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <%= hidden_field_tag 'reply_type',params[:reply_type],:value =>'user' %>
               <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
               <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index d4d9a2cd7..d9e00a112 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -1,10 +1,6 @@
 <% if @save_succ %>
     <% if @user_activity_id %>
-        <% if @reply_type == 'user' %>
-            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        <% else %>
-            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
-        <% end %>
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
         init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
     <% else %>
         <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %>
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index 6a56249a3..6d0055718 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -2,13 +2,19 @@
 	alert('<%=l(:notice_failed_delete)%>');
 <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication','HomeworkCommon'].include? @journal_destroyed.jour_type)%>
   <% if @is_user%>
-    var destroyedItem = $('#<%=@journal_destroyed.id%>');
+    <% if @activity %>
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
+        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
+    <% else %>
+        $("#user_activity_<%= @user_activity_id%>").hide();
+    <% end %>
+    /*var destroyedItem = $('#<%#=@journal_destroyed.id%>');
     destroyedItem.fadeOut(600,function(){
         destroyedItem.remove();
     });
-    <% if @jours_count && @jours_count == 0 %>
+    <%# if @jours_count && @jours_count == 0 %>
         $("#user_jour_list").css("padding","0px");
-    <% end %>
+    <%# end %>*/
   <% else %>
       <% if @bid && @jours_count %>
         $('#jours_count').html("<%= @jours_count %>");