From 0489b02e54e53175bdedf4f849c47497e41651cf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 21 Aug 2015 17:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb | 30 +++++++++++++++--------------
 app/models/journals_for_message.rb  |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index fc723d5d5..5158a99c4 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -70,20 +70,22 @@ class WordsController < ApplicationController
   end
   
   def destroy
-    @journal_destroyed = JournalsForMessage.delete_message(params[:object_id])
-    if @journal_destroyed.jour_type == "Bid"
-      @bid = Bid.find(@journal_destroyed.jour_id)
-      @jours_count =  @bid.journals_for_messages.where('m_parent_id IS NULL').count
-    elsif @journal_destroyed.jour_type == "Course"
-      @course = Course.find @journal_destroyed.jour_id
-      @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
-    elsif @journal_destroyed.jour_type == "Principal"
-      @user = User.find(@journal_destroyed.jour_id)
-      @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
-      @is_user = true
-    end
-    respond_to do |format|
-      format.js
+    @journal_destroyed = JournalsForMessage.find params[:object_id]
+    if @journal_destroyed.destroy
+      if @journal_destroyed.jour_type == "Bid"
+        @bid = Bid.find(@journal_destroyed.jour_id)
+        @jours_count =  @bid.journals_for_messages.where('m_parent_id IS NULL').count
+      elsif @journal_destroyed.jour_type == "Course"
+        @course = Course.find @journal_destroyed.jour_id
+        @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
+      elsif @journal_destroyed.jour_type == "Principal"
+        @user = User.find(@journal_destroyed.jour_id)
+        @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
+        @is_user = true
+      end
+      respond_to do |format|
+        format.js
+      end
     end
   end
 
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 853376f6a..2c56dc035 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -60,7 +60,7 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # 消息关联
   has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
-  has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:user_feeback_message, :dependent => :destroy
+  has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
   after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message