From e4bf35a1b824891869ae71b15a4e2ce8aa434d9a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 23 Feb 2016 15:22:44 +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=9B=9E=E5=A4=8D=E4=B8=8D=E8=83=BD=E8=87=AA=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb               | 7 ++++++-
 app/views/users/_user_journalsformessage.html.erb | 2 +-
 app/views/words/create_reply.js.erb               | 4 ++--
 app/views/words/destroy.js.erb                    | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 351be4e64..d1aa67483 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -74,9 +74,10 @@ 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]
+        @is_activity = params[:is_activity] if params[:is_activity]
       }
     end
 
@@ -98,6 +99,10 @@ class WordsController < ApplicationController
         @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
+        unless @activity
+          redirect_to feedback_path(@user)
+          return
+        end
       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 4b2fcb486..f49a65262 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -47,7 +47,7 @@
                   <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',
+                                :confirm => l(:text_are_you_sure), :method => 'delete',
                                 :class => "postOptionLink", :title => l(:button_delete))  %>
                   </li>
                 </ul>
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index a5c572049..ded05887f 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -1,11 +1,11 @@
 <% if @save_succ %>
     <% if @user_activity_id %>
-        <% if @reply_type == 'user' %>
+        <% if @is_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}) %>");
         <% else %>
             $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         <% end %>
-        #init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
+        //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
         sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "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 819936f9f..a2d606e76 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -4,7 +4,8 @@
   <% if @is_user%>
     <% 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");
+        //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
+        sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
     <% else %>
         $("#user_activity_<%= @user_activity_id%>").hide();
     <% end %>