课程留言无法删除
This commit is contained in:
parent
3ef3a1d405
commit
0489b02e54
|
@ -70,7 +70,8 @@ class WordsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@journal_destroyed = JournalsForMessage.delete_message(params[:object_id])
|
@journal_destroyed = JournalsForMessage.find params[:object_id]
|
||||||
|
if @journal_destroyed.destroy
|
||||||
if @journal_destroyed.jour_type == "Bid"
|
if @journal_destroyed.jour_type == "Bid"
|
||||||
@bid = Bid.find(@journal_destroyed.jour_id)
|
@bid = Bid.find(@journal_destroyed.jour_id)
|
||||||
@jours_count = @bid.journals_for_messages.where('m_parent_id IS NULL').count
|
@jours_count = @bid.journals_for_messages.where('m_parent_id IS NULL').count
|
||||||
|
@ -86,6 +87,7 @@ class WordsController < ApplicationController
|
||||||
format.js
|
format.js
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def destroyJournal
|
def destroyJournal
|
||||||
@journalP=JournalsForMessage.find(params[:object_id])
|
@journalP=JournalsForMessage.find(params[:object_id])
|
||||||
|
|
|
@ -60,7 +60,7 @@ class JournalsForMessage < ActiveRecord::Base
|
||||||
has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
|
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 :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?
|
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
|
after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message
|
||||||
|
|
Loading…
Reference in New Issue