From d51295127deea987e3cba2be65ee2d3be73a1507 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 26 Jul 2016 16:13:20 +0800
Subject: [PATCH] =?UTF-8?q?issue=E5=88=A0=E9=99=A4=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=99=84=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=20=E5=90=8C=E4=BA=8B=E5=85=B3=E8=81=94=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb     | 11 ++++++++++-
 app/models/journal.rb                    |  2 +-
 app/views/issues/_issue_replies.html.erb |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index ca91106e9..3b61fff14 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -507,9 +507,18 @@ class IssuesController < ApplicationController
 
   # 需要刷新详情页面，代码同步一致
   # 获取project和issue状态是为了刷新页面
+  # 值所以用delete是因为issue和journal在act_as_attachment中是同一个类型
   def delete_journal
      @issue = Issue.find(params[:id])
-     Journal.destroy(params[:journal_id])
+     begin
+       forge_acts = ForgeMessage.where(:forge_message_type => "Journal", :forge_message_id => params[:journal_id]).first
+       forge_acts.destroy unless forge_acts.nil?
+       at_message = AtMessage.where(:at_message_type => "Journal", :at_message_id => params[:journal_id]).first
+       at_message.destroy unless at_message.nil?
+       Journal.delete(params[:journal_id])
+     rescue Exception => e
+       puts e
+     end
      @user_activity_id = params[:user_activity_id]
      respond_to do |format|
       format.html{ redirect_to issue_url(@issue)}
diff --git a/app/models/journal.rb b/app/models/journal.rb
index d2cc9e539..f22015f47 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -55,7 +55,7 @@ class Journal < ActiveRecord::Base
   before_create :split_private_notes, :add_journals_count
   
   # fq
-  after_save :act_as_activity,:be_user_score, :act_as_forge_message, act_as_at_message(:notes, :user_id)
+  after_save :be_user_score, :act_as_forge_message, act_as_at_message(:notes, :user_id)
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index 2a5007bc3..070238a81 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -72,7 +72,7 @@
               <div class="mt5 fl">
                 <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
               </div>
-              <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
+              <span nhname='contentmsg_<%= @issue.id %>' class="fl mt5"></span>
               <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
               <div class="cl"></div>
           <% end %>