From 9b59ca20de663cae04e9bb648036ee5721b8d0e1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 14 Jul 2016 10:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=88=A0=E9=99=A4=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8E=E5=86=8D=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98issue?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=99=BD=E8=89=B2=E6=A1=86=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           | 16 ++++++++--------
 app/views/issues/_issue_replies.html.erb       |  3 +--
 app/views/issues/_issue_reply_ke_form.html.erb |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 73877ddc7..049842e37 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -432,12 +432,12 @@ class IssuesController < ApplicationController
 
   def add_journal
     if User.current.logged?
-      jour = Journal.new
-      jour.user_id = User.current.id
-      jour.notes = params[:notes]
-      jour.journalized = @issue
-      jour.save_attachments(params[:attachments])
-      jour.save
+      @jour = Journal.new
+      @jour.user_id = User.current.id
+      @jour.notes = params[:notes]
+      @jour.journalized = @issue
+      @jour.save_attachments(params[:attachments])
+      @jour.save
       update_user_activity(@issue.class,@issue.id)
       update_forge_activity(@issue.class,@issue.id)
       @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@@ -493,7 +493,7 @@ class IssuesController < ApplicationController
       update_forge_activity(@issue.class,@issue.id)
 
       respond_to do |format|
-        format.js
+        format.html{redirect_to issue_url(@issue)}
       end
     end
   end
@@ -503,7 +503,7 @@ class IssuesController < ApplicationController
      @issue = Issue.find(params[:id])
      Journal.destroy(params[:journal_id])
     respond_to do |format|
-      format.js
+      format.html{redirect_to issue_url(@issue)}
     end
   end
 
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index 7b5383c1e..4efef74b8 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -42,7 +42,6 @@
                           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)
@@ -73,7 +72,7 @@
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
               <div class="cl"></div>
               <div class="mt5 fl">
-                <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
+                <%= render :partial => 'attachments/issue_reply', :locals => {:container => @jour.nil? ? @issue : @jour} %>
               </div>
               <span nhname='contentmsg_<%= @issue.id %>' class="fl"></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>
diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb
index 7fbb0d191..87b599aa3 100644
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@@ -7,7 +7,7 @@
   <div class="ReplyToMessageInputContainer mb10">
     <% if User.current.logged? %>
         <div nhname='new_message_<%= @issue.id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+          <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post") do |f|%>
               <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
               <!--<div class="cl"></div>-->
               <input type="hidden" name="quote" value=""/>