From f12423e8a69bfd921bfaf10ff3b39bba5c09b4f8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 26 Jul 2016 16:29:03 +0800
Subject: [PATCH] =?UTF-8?q?issue=E5=8A=A8=E6=80=81=E4=B8=AD=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3b61fff14..63ef30b35 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -508,6 +508,7 @@ class IssuesController < ApplicationController
   # 需要刷新详情页面，代码同步一致
   # 获取project和issue状态是为了刷新页面
   # 值所以用delete是因为issue和journal在act_as_attachment中是同一个类型
+  # 非动态页面直接刷新，动态页面手动刷新
   def delete_journal
      @issue = Issue.find(params[:id])
      begin
@@ -521,7 +522,11 @@ class IssuesController < ApplicationController
      end
      @user_activity_id = params[:user_activity_id]
      respond_to do |format|
-      format.html{ redirect_to issue_url(@issue)}
+       if @user_activity_id
+         format.js
+       else
+         format.html{ redirect_to issue_url(@issue)}
+       end
     end
   end