diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 3a8a25133..4cd546b3b 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -103,14 +103,16 @@ class MessagesController < ApplicationController return normal_status(403, "您没有权限进行该操作") if current_user != @message.author && !current_user.teacher_of_course?(@message.board.course) begin - email_notify = @message.email_notify ? 1 : @board.course.email_notify && params[:email_notify] + board_id = @course.boards.find_by(id: params[:select_board_id]) + + email_notify = @message.email_notify ? 1 : @message.board&.course.email_notify && params[:email_notify] send_email = !@message.email_notify && email_notify - h = {is_md: true, email_notify: email_notify} + h = {is_md: true, email_notify: email_notify, board_id: board_id} m_params = message_params.merge(h) @message.update_attributes(m_params) Attachment.associate_container(params[:attachment_ids], @message.id, @message.class.name) @message.update_content(params[:content]) - notify_course_students(@message, @board.course) if send_email + notify_course_students(@message, @message.board&.course) if send_email rescue Exception => e uid_logger_error(e.message) tip_exception("修改失败") diff --git a/public/react/src/modules/page/taskList/TaskList.css b/public/react/src/modules/page/taskList/TaskList.css index 8898ab3e4..5d70558ab 100644 --- a/public/react/src/modules/page/taskList/TaskList.css +++ b/public/react/src/modules/page/taskList/TaskList.css @@ -96,7 +96,7 @@ } .tip-info-wrap .tip-info{ display: flex; - background: #707070; + background: rgba(40, 47, 53, 1); border: 1px solid rgba(112,112,112,1); border-radius: 100px; width: 375px;