From 1dbccd81d62e1eb0a60a464c8dac90f53aacd769 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 17 Dec 2015 17:15:03 +0800
Subject: [PATCH] =?UTF-8?q?issue=E5=9B=9E=E5=A4=8D=E7=9A=84=E5=88=A0?=
 =?UTF-8?q?=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/issues_controller.rb     | 14 ++++++++++++++
 app/views/issues/_issue_replies.html.erb | 24 ++++++++++++++++++++++--
 app/views/issues/add_journal.js.erb      |  4 ++--
 app/views/issues/delete_journal.js.erb   |  3 +++
 config/routes.rb                         |  2 ++
 public/javascripts/create_kindeditor.js  |  2 +-
 6 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 app/views/issues/delete_journal.js.erb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 140d49f37..b05050887 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -430,6 +430,20 @@ class IssuesController < ApplicationController
     end
   end
 
+  #对某个journ回复
+  def reply
+
+  end
+
+  #
+  def delete_journal
+     @issue = Issue.find(params[:id])
+     Journal.destroy(params[:journal_id])
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def find_project
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index b5142101f..a1b4a3415 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -6,8 +6,8 @@
           });
       </script>
       <% replies_all_i=replies_all_i + 1 %>
-      <li class="homepagePostReplyContainer" nhname="reply_rec" >
-        <div class="homepagePostReplyPortrait">
+      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
+        <div class="homepagePostReplyPortrait" >
           <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
         </div>
         <div class="homepagePostReplyDes">
@@ -27,6 +27,26 @@
             <% end %>
             <P><%= reply.notes.html_safe %></P>
           </div>
+          <div style="margin-top: 7px">
+            <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+              <%= link_to(
+                          l(:button_reply),
+                          {:controller => 'issues',:action => 'reply',:user_id=>reply.user_id, :id => issue.id,:journal_id=>reply.id},
+                          :remote => true,
+                          :method => 'get',
+                          :class => 'fr newsBlue',
+                          :title => l(:button_reply)) if  User.current.logged?  %>
+              <%= link_to(
+                          l(:button_delete),
+                          {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
+                          :method => :get,
+                          :remote=>true,
+                          :class => 'fr newsGrey mr10',
+                          :data => {:confirm => l(:text_are_you_sure)},
+                          :title => l(:button_delete)
+                  ) if reply.user_id == User.current.id %>
+            </div>
+          </div>
         </div>
         <div class="cl"></div>
       </li>
diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb
index ec7401fd3..d2052a887 100644
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@@ -4,6 +4,6 @@
     sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
 <%else%>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
-   init_activity_KindEditor_data(<%#= @user_activity_id%>,"","87%");
-   // sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+   init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+   // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
 <%end %>
\ No newline at end of file
diff --git a/app/views/issues/delete_journal.js.erb b/app/views/issues/delete_journal.js.erb
new file mode 100644
index 000000000..63a1a5f96
--- /dev/null
+++ b/app/views/issues/delete_journal.js.erb
@@ -0,0 +1,3 @@
+$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+$(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 52fa393ad..09b719b07 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -705,6 +705,8 @@ RedmineApp::Application.routes.draw do
     member do
       post 'add_journal'
       post 'add_journal_in_org'
+      get 'delete_journal'
+      post 'reply'
     end
     resources :time_entries, :controller => 'timelog' do
       collection do
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index fef444156..aaadcfde4 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -26,7 +26,7 @@ function sd_create_editor(params){
         afterBlur:function(){
             //params.toolbar_container.hide();
             sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            if(this.edit.html()=="") {
+            if(this.isEmpty()) {
                 this.edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
             }
             //params.toolbar_container.hide();