diff --git a/app/views/shixuns/index.json.jbuilder b/app/views/shixuns/index.json.jbuilder index 8e5d49a34..5279d309d 100644 --- a/app/views/shixuns/index.json.jbuilder +++ b/app/views/shixuns/index.json.jbuilder @@ -8,3 +8,9 @@ json.search_tags @search_tags json.shixuns do json.partial! 'shixun', locals: {shixuns: @shixuns} end + +s_s = '' + +json.html_contents sanitize(s_s, tags: %w(img a table tr td tbody pre), attributes: %w(src href target style)).gsub(">\n<", "><") + .gsub(/^\n/, "").gsub("    ", "").gsub(/(\n)+/, "
").gsub("\t", " ").gsub("\n", "").gsub(" ", " ") + .gsub(/()+/, "
") \ No newline at end of file diff --git a/db/migrate/20190805010546_modify_ke_contents_for_markdown.rb b/db/migrate/20190805010546_modify_ke_contents_for_markdown.rb deleted file mode 100644 index 3d993cfb8..000000000 --- a/db/migrate/20190805010546_modify_ke_contents_for_markdown.rb +++ /dev/null @@ -1,48 +0,0 @@ -class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2] - include ActionView::Helpers::SanitizeHelper - def change - # def ke_transform_to_md content - # return content if content.blank? - # s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style)) - # s_contents.gsub(/^(\n)/, "").gsub(/(\n)+/, "
").gsub(/$(\n)/, "") - # .gsub(/(\n)+/, "
").gsub("\t", " ") - # end - # - # # 课程讨论区 - # MessageDetail.find_each do |m| - # content = ke_transform_to_md m.content - # m.update_column(:content, content) - # end - # - # # 试卷的标题 - # ExerciseQuestion.find_each do |eq| - # question_title = ke_transform_to_md eq.question_title - # eq.update_column(:question_title, question_title) - # end - # - # # 试卷的答案 - # ExerciseStandardAnswer.find_each do |esa| - # answer_text = ke_transform_to_md esa.answer_text - # esa.update_column(:answer_text, answer_text) - # end - # - # # 试卷题库的问题标题 - # ExerciseBankQuestion.find_each do |ebq| - # question_title = ke_transform_to_md ebq.question_title - # ebq.update_column(:question_title, question_title) - # end - # - # # 试卷答案 - # ExerciseBankStandardAnswer.find_each do |ebsa| - # answer_text = ke_transform_to_md ebsa.answer_text - # ebsa.update_column(:answer_text, answer_text) - # end - # - # # 问卷的标题 - # PollQuestion.find_each do |pq| - # question_title = ke_transform_to_md pq.question_title - # pq.update_column(:question_title, question_title) - # end - - end -end diff --git a/db/migrate/20190805010549_modify_ke_contents_for_markdown.rb b/db/migrate/20190805010549_modify_ke_contents_for_markdown.rb new file mode 100644 index 000000000..5b2e7a2a5 --- /dev/null +++ b/db/migrate/20190805010549_modify_ke_contents_for_markdown.rb @@ -0,0 +1,48 @@ +class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2] + include ActionView::Helpers::SanitizeHelper + def change + def ke_transform_to_md content + return content if content.blank? + s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style)) + s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub("    ", "").gsub(/(\n)+/, "
") + .gsub("\t", " ").gsub("\n", "").gsub(" ", " ").gsub(/()+/, "
") + end + + # 课程讨论区 + MessageDetail.find_each do |m| + content = ke_transform_to_md m.content + m.update_column(:content, content) + end + + # 试卷的标题 + ExerciseQuestion.find_each do |eq| + question_title = ke_transform_to_md eq.question_title + eq.update_column(:question_title, question_title) + end + + # 试卷的答案 + ExerciseStandardAnswer.find_each do |esa| + answer_text = ke_transform_to_md esa.answer_text + esa.update_column(:answer_text, answer_text) + end + + # 试卷题库的问题标题 + ExerciseBankQuestion.find_each do |ebq| + question_title = ke_transform_to_md ebq.question_title + ebq.update_column(:question_title, question_title) + end + + # 试卷答案 + ExerciseBankStandardAnswer.find_each do |ebsa| + answer_text = ke_transform_to_md ebsa.answer_text + ebsa.update_column(:answer_text, answer_text) + end + + # 问卷的标题 + PollQuestion.find_each do |pq| + question_title = ke_transform_to_md pq.question_title + pq.update_column(:question_title, question_title) + end + + end +end diff --git a/db/migrate/20190806062209_second_mofidy_ke_contents_for_md.rb b/db/migrate/20190806062209_second_mofidy_ke_contents_for_md.rb index 044e6c0dd..2444dbe3e 100644 --- a/db/migrate/20190806062209_second_mofidy_ke_contents_for_md.rb +++ b/db/migrate/20190806062209_second_mofidy_ke_contents_for_md.rb @@ -1,63 +1,64 @@ class SecondMofidyKeContentsForMd < ActiveRecord::Migration[5.2] include ActionView::Helpers::SanitizeHelper def change - # def ke_transform_to_md content - # return content if content.blank? - # s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style)) - # s_contents.gsub(/^(\n)/, "").gsub(/(\n)+/, "
").gsub(/$(\n)/, "") - # .gsub(/(\n)+/, "
").gsub("\t", " ") - # end - # - # # 作业 - # HomeworkCommon.find_each do |hc| - # description = ke_transform_to_md hc.description - # reference_answer = ke_transform_to_md hc.reference_answer - # explanation = ke_transform_to_md hc.explanation - # hc.update_attributes(description: description, reference_answer: reference_answer, explanation: explanation) - # end - # - # # 作业题库 - # HomeworkBank.find_each do |hb| - # description = ke_transform_to_md hb.description - # reference_answer = ke_transform_to_md hb.reference_answer - # hb.update_attributes(description: description, reference_answer: reference_answer) - # end - # - # # 毕业任务 - # GraduationTask.find_each do |gt| - # description = ke_transform_to_md gt.description - # gt.update_column(:description, description) - # end - # - # # 毕设选题 - # GraduationTopic.find_each do |gt| - # description = ke_transform_to_md gt.description - # gt.update_column(:description, description) - # end - # - # # 毕设作品 - # GraduationWork.find_each do |gw| - # description = ke_transform_to_md gw.description - # gw.update_column(:description, description) - # end - # - # # 毕设任务题库 - # GtaskBank.find_each do |gb| - # description = ke_transform_to_md gb.description - # gb.update_column(:description, description) - # end - # - # # 毕设选题题库 - # GtopicBank.find_each do |gb| - # description = ke_transform_to_md gb.description - # gb.update_column(:description, description) - # end - # - # # 交流问答 - # Memo.find_each do |m| - # content = ke_transform_to_md m.content - # m.update_column(:content, content) - # end + def ke_transform_to_md content + return content if content.blank? + s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style)) + s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub("    ", "").gsub(/(\n)+/, "
") + .gsub("\t", " ").gsub("\n", "").gsub(" ", " ").gsub(/()+/, "
") + + end + + # 作业 + HomeworkCommon.find_each do |hc| + description = ke_transform_to_md hc.description + reference_answer = ke_transform_to_md hc.reference_answer + explanation = ke_transform_to_md hc.explanation + hc.update_attributes(description: description, reference_answer: reference_answer, explanation: explanation) + end + + # 作业题库 + HomeworkBank.find_each do |hb| + description = ke_transform_to_md hb.description + reference_answer = ke_transform_to_md hb.reference_answer + hb.update_attributes(description: description, reference_answer: reference_answer) + end + + # 毕业任务 + GraduationTask.find_each do |gt| + description = ke_transform_to_md gt.description + gt.update_column(:description, description) + end + + # 毕设选题 + GraduationTopic.find_each do |gt| + description = ke_transform_to_md gt.description + gt.update_column(:description, description) + end + + # 毕设作品 + GraduationWork.find_each do |gw| + description = ke_transform_to_md gw.description + gw.update_column(:description, description) + end + + # 毕设任务题库 + GtaskBank.find_each do |gb| + description = ke_transform_to_md gb.description + gb.update_column(:description, description) + end + + # 毕设选题题库 + GtopicBank.find_each do |gb| + description = ke_transform_to_md gb.description + gb.update_column(:description, description) + end + + # 交流问答 + Memo.find_each do |m| + content = ke_transform_to_md m.content + m.update_column(:content, content) + end end end diff --git a/db/migrate/20190806063903_third_modify_ke_for_student_work.rb b/db/migrate/20190806063903_third_modify_ke_for_student_work.rb index 8c7fb0b29..4969ffeae 100644 --- a/db/migrate/20190806063903_third_modify_ke_for_student_work.rb +++ b/db/migrate/20190806063903_third_modify_ke_for_student_work.rb @@ -1,17 +1,17 @@ class ThirdModifyKeForStudentWork < ActiveRecord::Migration[5.2] include ActionView::Helpers::SanitizeHelper def change - # def ke_transform_to_md content - # return content if content.blank? - # s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style)) - # s_contents.gsub(/^(\n)/, "").gsub(/(\n)+/, "
").gsub(/$(\n)/, "") - # .gsub(/(\n)+/, "
").gsub("\t", " ") - # end - # - # # 学生的作品 过滤掉一些描述的ke图片的作品 - # StudentWork.where("description is not null and LENGTH(description) < 1000000").find_each do |sw| - # description = ke_transform_to_md sw.description - # sw.update_column(:description, description) - # end + def ke_transform_to_md content + return content if content.blank? + s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style)) + s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub(" ", "").gsub(/(\n)+/, "
") + .gsub("\t", " ").gsub("\n", "").gsub(" ", " ").gsub(/()+/, "
") + end + + # 学生的作品 过滤掉一些描述的ke图片的作品 + StudentWork.where("description is not null and LENGTH(description) < 1000000").find_each do |sw| + description = ke_transform_to_md sw.description + sw.update_column(:description, description) + end end end diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index e08f321a4..78242866e 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -189,7 +189,7 @@ class MemoDetail extends Component { let filesize = item.filesize attachments.push( -
+
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index a2cbaab54..6abc71747 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -116,7 +116,7 @@ class ShixunsHome extends Component { } return ( -
+
{this.state.updata===undefined?"":} @@ -128,6 +128,9 @@ class ShixunsHome extends Component {