Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_forum
cxt 5 years ago
commit 05691d03cf

@ -102,7 +102,9 @@ class MessagesController < ApplicationController
return normal_status(403, "您没有权限进行该操作") if current_user != @message.author && !current_user.teacher_of_course?(@message.board.course) return normal_status(403, "您没有权限进行该操作") if current_user != @message.author && !current_user.teacher_of_course?(@message.board.course)
begin begin
@message.update_attributes(message_params) h = {is_md: true}
m_params = message_params.merge(h)
@message.update_attributes(m_params)
Attachment.associate_container(params[:attachment_ids], @message.id, @message.class.name) Attachment.associate_container(params[:attachment_ids], @message.id, @message.class.name)
@message.update_content(params[:content]) @message.update_content(params[:content])
rescue Exception => e rescue Exception => e

@ -1 +1,2 @@
json.extract! message, :id, :parent_id, :subject, :created_on, :total_replies_count, :total_praises_count, :praises_count, :visits, :sticky, :is_hidden, :is_public json.extract! message, :id, :parent_id, :subject, :created_on, :total_replies_count, :total_praises_count,
:is_md, :praises_count, :visits, :sticky, :is_hidden, :is_public

@ -0,0 +1,5 @@
class AddIsMdForMessages < ActiveRecord::Migration[5.2]
def change
add_column :messages, :is_md, :boolean, :default => true
end
end

@ -0,0 +1,7 @@
class ModifyIsMdForMessages < ActiveRecord::Migration[5.2]
def change
Message.find_each do |m|
m.update_column(:is_md, false)
end
end
end
Loading…
Cancel
Save